treewide: 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.
Replaced nrfx_clock.h api calls with nrfx_clock_... calls.

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

Author: mif1-nordic

applications/nrf5340_audio/src/audio/audio_datapath.c

@@ -12,7 +12,7 @@
 #include <zephyr/zbus/zbus.h>
 #include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
-#include <nrfx_clock.h>
+#include <nrfx_clock_hfclkaudio.h>
 #include <contin_array.h>
 #include <tone.h>
 #include <pcm_mix.h>

applications/nrf5340_audio/src/audio/le_audio_rx.c

@@ -8,7 +8,6 @@
 
 #include <stdlib.h>
 #include <zephyr/kernel.h>
-#include <nrfx_clock.h>
 
 #include "streamctrl.h"
 #include "audio_datapath.h"

applications/nrf5340_audio/src/modules/audio_i2s.c

@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <nrfx_i2s.h>
-#include <nrfx_clock.h>
+#include <nrfx_clock_hfclkaudio.h>
 
 #include "audio_sync_timer.h"
 

applications/nrf5340_audio/src/utils/peripherals.c

@@ -5,7 +5,7 @@
  */
 #include "peripherals.h"
 
-#include <nrfx_clock.h>
+#include <nrfx_clock_hfclk.h>
 
 #include "led_assignments.h"
 #include "led.h"
@@ -148,10 +148,7 @@ int peripherals_init(void)
 	}
 
 	/* Use this to turn on 128 MHz clock for cpu_app */
-	ret = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
-	if (ret) {
-		return ret;
-	}
+	nrfx_clock_hfclk_divider_set(NRF_CLOCK_HFCLK_DIV_1);
 
 	return 0;
 }

applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf

@@ -89,7 +89,7 @@ CONFIG_QDEC_NRFX=y
 CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+CONFIG_CLOCK_CONTROL_NRF=n
 
 CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_ID_MAX=3

applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf

@@ -84,7 +84,7 @@ CONFIG_QDEC_NRFX=y
 CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+CONFIG_CLOCK_CONTROL_NRF=n
 
 CONFIG_BT_MAX_PAIRED=2
 CONFIG_BT_ID_MAX=3

applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf

@@ -102,7 +102,7 @@ CONFIG_LED_PWM=y
 # Disable unused LED driver to reduce memory footprint.
 CONFIG_LED_GPIO=n
 
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+CONFIG_CLOCK_CONTROL_NRF=n
 
 CONFIG_BT_MAX_PAIRED=4
 CONFIG_BT_ID_MAX=5

applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf

@@ -99,7 +99,7 @@ CONFIG_LED_PWM=y
 # Disable unused LED driver to reduce memory footprint.
 CONFIG_LED_GPIO=n
 
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+CONFIG_CLOCK_CONTROL_NRF=n
 
 CONFIG_BT_MAX_PAIRED=4
 CONFIG_BT_ID_MAX=5

applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf

@@ -116,7 +116,7 @@ CONFIG_LED_PWM=y
 # Disable unused LED driver to reduce memory footprint.
 CONFIG_LED_GPIO=n
 
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+CONFIG_CLOCK_CONTROL_NRF=n
 
 # Enable MCUmgr Bluetooth transport and increase Bluetooth buffers to speed up DFU image transfer.
 CONFIG_MCUMGR_TRANSPORT_BT=y

applications/nrf_desktop/src/modules/hfclk_lock.c

@@ -17,11 +17,16 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE);
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 static struct onoff_manager *mgr;
+#else
+static struct device *dev;
+#endif
 static struct onoff_client cli;
 
 static void hfclk_lock(void)
 {
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 	if (mgr) {
 		return;
 	}
@@ -41,19 +46,52 @@ static void hfclk_lock(void)
 			module_set_state(MODULE_STATE_READY);
 		}
 	}
+#else
+	if (dev) {
+		return;
+	}
+
+	dev = DEVICE_DT_GET_ONE(COND_CODE_1((NRF_CLOCK_HAS_HFCLK),
+					    (nordic_nrf_clock_hfclk),
+					    (nordic_nrf_clock_xo)));
+	if (!dev) {
+		module_set_state(MODULE_STATE_ERROR);
+	} else {
+		int err;
+
+		sys_notify_init_spinwait(&cli.notify);
+		err = nrf_clock_control_request(dev, NULL, &cli);
+		if (err < 0) {
+			dev = NULL;
+			module_set_state(MODULE_STATE_ERROR);
+		} else {
+			module_set_state(MODULE_STATE_READY);
+		}
+	}
+#endif
 }
 
 static void hfclk_unlock(void)
 {
 	int err;
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 	if (!mgr) {
 		return;
 	}
 
 	err = onoff_cancel_or_release(mgr, &cli);
 	module_set_state((err < 0) ? MODULE_STATE_ERROR : MODULE_STATE_OFF);
 	mgr = NULL;
+#else
+	if (!dev) {
+		return;
+	}
+
+	err = nrf_clock_control_cancel_or_release(dev, NULL, &cli);
+	module_set_state((err < 0) ? MODULE_STATE_ERROR : MODULE_STATE_OFF);
+	dev = NULL;
+#endif
 }