[nrf fromlist] Replace clock api with clock api v2

Replaced old clock_control.h api with nrf_clock_control.h api.
Old api is still available when CONFIG_CLOCK_CONTROL_NRF is set.

Upstream PR #: 99290

Signed-off-by: Michal Frankiewicz <[email protected]>

Author: mif1-nordic

drivers/audio/dmic_nrfx_pdm.c

@@ -30,10 +30,23 @@ BUILD_ASSERT((DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
 	     (DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
 	      "Unsupported Audio AUXPLL frequency selection for PDM");
 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
-#else
+#elif CONFIG_CLOCK_CONTROL_NRF
 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
 #define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
 				   DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0))
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO)
+#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ                                                                 \
+	DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency,                                            \
+		   DT_PROP_OR(DT_NODELABEL(hfclkaudio), hfclkaudio_frequency, 0))
+#endif
+
+#if defined(CONFIG_CLOCK_CONTORL_NRF)
+#define HFCLKAUDIO_NODE      clock
+#define HFCLKAUDIO_NODE_DESC "hfclkaudio-frequency in the nordic,nrf-clock node, "
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO)
+#define HFCLKAUDIO_NODE      hfclkaudio
+#define HFCLKAUDIO_NODE_DESC "hfclkaudio-frequency in the nordic,nrf-clock-hfclkaudio node, "
 #endif
 
 struct dmic_nrfx_pdm_drv_data {
@@ -42,6 +55,9 @@ struct dmic_nrfx_pdm_drv_data {
 	const struct device *audiopll_dev;
 #elif CONFIG_CLOCK_CONTROL_NRF
 	struct onoff_manager *clk_mgr;
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO) || defined(CONFIG_CLOCK_CONTROL_NRF_HFCLK) ||   \
+	defined(CONFIG_CLOCK_CONTROL_NRF_XO)
+	const struct device *clk_dev;
 #endif
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
@@ -87,6 +103,9 @@ static int request_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
 	return nrf_clock_control_request(drv_data->audiopll_dev, NULL, &drv_data->clk_cli);
 #elif CONFIG_CLOCK_CONTROL_NRF
 	return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO) || defined(CONFIG_CLOCK_CONTROL_NRF_HFCLK) ||   \
+	defined(CONFIG_CLOCK_CONTROL_NRF_XO)
+	return nrf_clock_control_request(drv_data->clk_dev, NULL, &drv_data->clk_cli);
 #else
 	return -ENOTSUP;
 #endif
@@ -101,6 +120,9 @@ static int release_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
 	return nrf_clock_control_release(drv_data->audiopll_dev, NULL);
 #elif CONFIG_CLOCK_CONTROL_NRF
 	return onoff_release(drv_data->clk_mgr);
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO) || defined(CONFIG_CLOCK_CONTROL_NRF_HFCLK) ||   \
+	defined(CONFIG_CLOCK_CONTROL_NRF_XO)
+	return nrf_clock_control_release(drv_data->clk_dev, NULL);
 #else
 	return -ENOTSUP;
 #endif
@@ -482,6 +504,23 @@ static void init_clock_manager(const struct device *dev)
 
 	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
 	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO) || defined(CONFIG_CLOCK_CONTROL_NRF_HFCLK) ||   \
+	defined(CONFIG_CLOCK_CONTROL_NRF_XO)
+	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+#if NRF_CLOCK_HAS_HFCLKAUDIO
+	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
+
+	if (drv_cfg->clk_src == ACLK) {
+		drv_data->clk_dev = DEVICE_DT_GET_ONE(nordic_nrf_clock_hfclkaudio);
+	} else
+#endif
+	{
+		drv_data->clk_dev = DEVICE_DT_GET_ONE(COND_CODE_1((NRF_CLOCK_HAS_HFCLK),
+								  (nordic_nrf_clock_hfclk),
+								  (nordic_nrf_clock_xo)));
+	}
+
+	__ASSERT_NO_MSG(drv_data->clk_dev != NULL);
 #elif CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
 
@@ -536,17 +575,16 @@ static const struct _dmic_ops dmic_ops = {
 	NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(DT_DRV_INST(inst));                          \
 	BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK || NRF_PDM_HAS_SELECTABLE_CLOCK,                    \
 		     "Clock source ACLK is not available.");                                       \
-	BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK ||                                                  \
-			     DT_NODE_HAS_PROP(DT_NODELABEL(clock), hfclkaudio_frequency) ||        \
-			     DT_NODE_HAS_PROP(DT_NODELABEL(aclk), clock_frequency) ||              \
-			     DT_NODE_HAS_PROP(NODE_AUDIOPLL, frequency) ||                         \
-			     DT_NODE_HAS_PROP(NODE_AUDIO_AUXPLL, nordic_frequency),                \
-		     "Clock source ACLK requires one following defined frequency "                 \
-		     "properties: "                                                                \
-		     "hfclkaudio-frequency in the nordic,nrf-clock node, "                         \
-		     "clock-frequency in the aclk node, "                                          \
-		     "frequency in the audiopll node, "                                            \
-		     "nordic-frequency in the audio_auxpll node");                                 \
+	BUILD_ASSERT(                                                                              \
+		PDM_CLK_SRC(inst) != ACLK ||                                                       \
+			DT_NODE_HAS_PROP(DT_NODELABEL(HFCLKAUDIO_NODE), hfclkaudio_frequency) ||   \
+			DT_NODE_HAS_PROP(DT_NODELABEL(aclk), clock_frequency) ||                   \
+			DT_NODE_HAS_PROP(NODE_AUDIOPLL, frequency) ||                              \
+			DT_NODE_HAS_PROP(NODE_AUDIO_AUXPLL, nordic_frequency),                     \
+		"Clock source ACLK requires one following defined frequency "                      \
+		"properties: " HFCLKAUDIO_NODE_DESC "clock-frequency in the aclk node, "           \
+		"frequency in the audiopll node, "                                                 \
+		"nordic-frequency in the audio_auxpll node");                                      \
 	DEVICE_DT_INST_DEFINE(inst, pdm_nrfx_init##inst, NULL, &dmic_nrfx_pdm_data##inst,          \
 			      &dmic_nrfx_pdm_cfg##inst, POST_KERNEL,                               \
 			      CONFIG_AUDIO_DMIC_INIT_PRIORITY, &dmic_ops);

drivers/clock_control/clock_control_nrf_lfclk.c

@@ -51,6 +51,28 @@ LOG_MODULE_REGISTER(clock_control_lfclk, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 #define CLOCK_DEVICE_HF DEVICE_DT_GET_ONE(nordic_nrf_clock_xo)
 #endif
 
+#define LFCLK_SRC (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src))
+
+#if ((LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_RC) && \
+     (LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_XTAL) && \
+     (LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_SYNTH) && \
+     (LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING) && \
+     (LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING))
+#error "Unsupported LFCLK source configured in devicetree"
+#endif
+
+#if (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src) == CLOCK_CONTROL_NRF_K32SRC_RC)
+#define K32SRC NRF_CLOCK_LFCLK_RC
+#elif (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src) == CLOCK_CONTROL_NRF_K32SRC_XTAL)
+#define K32SRC NRF_CLOCK_LFCLK_XTAL
+#elif (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src) == CLOCK_CONTROL_NRF_K32SRC_SYNTH)
+#define K32SRC NRF_CLOCK_LFCLK_SYNTH
+#elif (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src) == CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING)
+#define K32SRC NRF_CLOCK_LFCLK_XTAL_LOW_SWING
+#elif (DT_STRING_TOKEN(DT_NODELABEL(lfclk), k32src) == CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING)
+#define K32SRC NRF_CLOCK_LFCLK_XTAL_FULL_SWING
+#endif
+
 typedef void (*clk_ctrl_func_t)(void);
 
 typedef struct {
@@ -68,7 +90,7 @@ typedef struct {
 #endif
 } lfclk_config_t;
 
-#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+#if (LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_SYNTH)
 /* Client to request HFXO to synthesize low frequency clock. */
 static struct onoff_client lfsynth_cli;
 #endif
@@ -149,7 +171,7 @@ static void lfclk_start(void)
 		anomaly_132_workaround();
 	}
 
-#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+#if (LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_SYNTH)
 	sys_notify_init_spinwait(&lfsynth_cli.notify);
 
 	(void)nrf_clock_control_request(CLOCK_DEVICE_HF, NULL, &lfsynth_cli);
@@ -166,7 +188,7 @@ static void lfclk_stop(void)
 
 	nrfx_clock_lfclk_stop();
 
-#if CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH
+#if (LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_SYNTH)
 
 	(void)nrf_clock_control_cancel_or_release(CLOCK_DEVICE_HF, NULL, &lfsynth_cli);
 #endif
@@ -234,16 +256,16 @@ static void lfclk_spinwait(enum nrf_lfclk_start_mode mode)
 		/* For sources XTAL, EXT_LOW_SWING, and EXT_FULL_SWING,
 		 * NRF_CLOCK_LFCLK_XTAL is returned as the type of running clock.
 		 */
-		(IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL) ||
-		 IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING) ||
-		 IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING))
+		((LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_XTAL) ||
+		 (LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING) ||
+		 (LFCLK_SRC == CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING))
 		? NRF_CLOCK_LFCLK_XTAL
-		: CLOCK_CONTROL_NRF_K32SRC;
+		: K32SRC;
 	nrf_clock_lfclk_t type;
 
 	if ((mode == CLOCK_CONTROL_NRF_LF_START_AVAILABLE) &&
 	    (target_type == NRF_CLOCK_LFCLK_XTAL) &&
-	    (nrf_clock_lf_srccopy_get(NRF_CLOCK) == CLOCK_CONTROL_NRF_K32SRC)) {
+	    (nrf_clock_lf_srccopy_get(NRF_CLOCK) == K32SRC)) {
 		/* If target clock source is using XTAL then due to two-stage
 		 * clock startup sequence, RC might already be running.
 		 * It can be determined by checking current LFCLK source. If it
@@ -266,7 +288,7 @@ static void lfclk_spinwait(enum nrf_lfclk_start_mode mode)
 		/* Synth source start is almost instant and LFCLKSTARTED may
 		 * happen before calling idle. That would lead to deadlock.
 		 */
-		if (!IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_SYNTH)) {
+		if (LFCLK_SRC != CLOCK_CONTROL_NRF_K32SRC_SYNTH) {
 			if (isr_mode || !IS_ENABLED(CONFIG_MULTITHREADING)) {
 				k_cpu_atomic_idle(key);
 			} else {
@@ -277,12 +299,9 @@ static void lfclk_spinwait(enum nrf_lfclk_start_mode mode)
 		/* Clock interrupt is locked, LFCLKSTARTED is handled here. */
 		if ((target_type ==  NRF_CLOCK_LFCLK_XTAL)
 		    && (nrf_clock_lf_src_get(NRF_CLOCK) == NRF_CLOCK_LFCLK_RC)
-		    && nrf_clock_event_check(NRF_CLOCK,
-					     NRF_CLOCK_EVENT_LFCLKSTARTED)) {
-			nrf_clock_event_clear(NRF_CLOCK,
-					      NRF_CLOCK_EVENT_LFCLKSTARTED);
-			nrf_clock_lf_src_set(NRF_CLOCK,
-					     CLOCK_CONTROL_NRF_K32SRC);
+		    && nrf_clock_event_check(NRF_CLOCK, NRF_CLOCK_EVENT_LFCLKSTARTED)) {
+			nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_LFCLKSTARTED);
+			nrf_clock_lf_src_set(NRF_CLOCK, K32SRC);
 
 			/* Clear pending interrupt, otherwise new clock event
 			 * would not wake up from idle.

drivers/clock_control/nrf_clock_calibration.c

@@ -7,7 +7,11 @@
 #include <zephyr/drivers/clock_control.h>
 #include "nrf_clock_calibration.h"
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <nrfx_clock.h>
+#else
+#include <nrfx_clock_lfclk.h>
+#endif
 #include <zephyr/logging/log.h>
 #include <stdlib.h>
 
@@ -155,7 +159,11 @@ static void cal_lf_callback(struct onoff_manager *mgr,
 /* Start actual HW calibration assuming that HFCLK XTAL is on. */
 static void start_hw_cal(void)
 {
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 	nrfx_clock_calibration_start();
+#else
+	nrfx_clock_lfclk_calibration_start();
+#endif
 	calib_skip_cnt = CONFIG_CLOCK_CONTROL_NRF_CALIBRATION_MAX_SKIP;
 }
 

drivers/counter/counter_nrfx_rtc.c

@@ -528,7 +528,7 @@ static int init_rtc(const struct device *dev, uint32_t prescaler)
 	NRF_RTC_Type *rtc = nrfx_config->rtc;
 	int err;
 
-#ifdef CONFIG_CLOCK_CONTROL_NRF
+#ifndef HALTIUM_XXAA
 	z_nrf_clock_control_lf_on(CLOCK_CONTROL_NRF_LF_START_NOWAIT);
 #endif
 

drivers/i2s/i2s_nrf_tdm.c

@@ -106,9 +106,6 @@ struct tdm_drv_cfg {
 };
 
 struct tdm_drv_data {
-#if CONFIG_CLOCK_CONTROL_NRF
-	struct onoff_manager *clk_mgr;
-#endif
 	struct onoff_client clk_cli;
 	struct stream_cfg tx;
 	struct k_msgq tx_queue;
@@ -129,9 +126,7 @@ struct tdm_drv_data {
 
 static int audio_clock_request(struct tdm_drv_data *drv_data)
 {
-#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRF
-	return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
-#elif DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
+#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
 	return nrf_clock_control_request(audiopll, &aclk_spec, &drv_data->clk_cli);
 #else
 	(void)drv_data;
@@ -142,9 +137,7 @@ static int audio_clock_request(struct tdm_drv_data *drv_data)
 
 static int audio_clock_release(struct tdm_drv_data *drv_data)
 {
-#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRF
-	return onoff_release(drv_data->clk_mgr);
-#elif DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
+#if DT_NODE_HAS_STATUS_OKAY(NODE_ACLK) && CONFIG_CLOCK_CONTROL_NRFS_AUDIOPLL
 	(void)drv_data;
 
 	return nrf_clock_control_release(audiopll, &aclk_spec);
@@ -1110,20 +1103,6 @@ static void data_handler(const struct device *dev, const tdm_buffers_t *released
 	}
 }
 
-static void clock_manager_init(const struct device *dev)
-{
-#if CONFIG_CLOCK_CONTROL_NRF && NRF_CLOCK_HAS_HFCLKAUDIO
-	clock_control_subsys_t subsys;
-	struct tdm_drv_data *drv_data = dev->data;
-
-	subsys = CLOCK_CONTROL_NRF_SUBSYS_HFAUDIO;
-	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
-	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
-#else
-	(void)dev;
-#endif
-}
-
 static int data_init(const struct device *dev)
 {
 	struct tdm_drv_data *drv_data = dev->data;
@@ -1190,7 +1169,6 @@ static DEVICE_API(i2s, tdm_nrf_drv_api) = {
 			    sizeof(struct tdm_buf), ARRAY_SIZE(tx_msgs##idx));                     \
 		k_msgq_init(&tdm_nrf_data##idx.rx_queue, (char *)rx_msgs##idx,                     \
 			    sizeof(struct tdm_buf), ARRAY_SIZE(rx_msgs##idx));                     \
-		clock_manager_init(dev);                                                           \
 		return 0;                                                                          \
 	}                                                                                          \
 	BUILD_ASSERT((TDM_SCK_CLK_SRC(idx) != ACLK && TDM_MCK_CLK_SRC(idx) != ACLK) ||             \