Revert "[nrf fromlist] drivers: clock_control: nrf2: add support for …

…global hfsll clock"

This reverts commit 5227b68.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>

drivers/clock_control/CMakeLists.txt

@@ -35,7 +35,6 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
-zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)

drivers/clock_control/Kconfig.nrf

@@ -193,31 +193,4 @@ config CLOCK_CONTROL_NRF2_NRFS_CLOCK_TIMEOUT_MS
 	int "Timeout waiting for nrfs clock service callback in milliseconds"
 	default 1000
 
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-	bool "Clock control for global HSFLL"
-	depends on NRFS_GDFS_SERVICE_ENABLED
-	default y
-
-if CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_TIMEOUT_MS
-	int "Frequency request timeout in milliseconds"
-	default 10000
-
-config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_REQ_LOW_FREQ
-	bool "Request LOW frequency on init"
-	default y
-	help
-	  The GDFS service will default to HIGH frequency until it receives
-	  a lower frequency request. The NRF2 clock controller drivers
-	  expect the clock to be initialized to their lowest frequency, so
-	  we need to send a request on init to align GDFS with the NRF2
-	  clock controller driver.
-
-	  This initial request can be disabled to prevent a potentially
-	  unnecessary HIGH -> LOW -> HIGH cycle given some module will
-	  request a HIGH frequency on init anyway.
-
-endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
-
 endif # CLOCK_CONTROL_NRF2

drivers/clock_control/clock_control_nrf2_hsfll.c

@@ -8,6 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <hal/nrf_hsfll.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -182,6 +183,18 @@ static int api_cancel_or_release_hsfll(const struct device *dev,
 #endif
 }
 
+static int api_get_rate_hsfll(const struct device *dev,
+			      clock_control_subsys_t sys,
+			      uint32_t *rate)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(sys);
+
+	*rate = nrf_hsfll_clkctrl_mult_get(NRF_HSFLL) * MHZ(16);
+
+	return 0;
+}
+
 static int hsfll_init(const struct device *dev)
 {
 #ifdef CONFIG_NRFS_DVFS_LOCAL_DOMAIN
@@ -208,6 +221,7 @@ static struct nrf_clock_control_driver_api hsfll_drv_api = {
 	.std_api = {
 		.on = api_nosys_on_off,
 		.off = api_nosys_on_off,
+		.get_rate = api_get_rate_hsfll,
 	},
 	.request = api_request_hsfll,
 	.release = api_release_hsfll,