Revert "[nrf fromlist] soc: nordic: Add LRCCONF management"

This reverts commit 1cc6e15.

Signed-off-by: Adam Kondraciuk <[email protected]>

Author: adamkondraciuk

drivers/clock_control/clock_control_nrf2_common.c

@@ -4,6 +4,7 @@
  */
 
 #include "clock_control_nrf2_common.h"
+#include <hal/nrf_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -24,6 +25,9 @@ LOG_MODULE_REGISTER(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 STRUCT_CLOCK_CONFIG(generic, ONOFF_CNT_MAX);
 
+static sys_slist_t poweron_main_list;
+static struct k_spinlock poweron_main_lock;
+
 static void update_config(struct clock_config_generic *cfg)
 {
 	atomic_val_t prev_flags = atomic_or(&cfg->flags, FLAG_UPDATE_NEEDED);
@@ -159,3 +163,34 @@ int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys)
 
 	return -ENOSYS;
 }
+
+void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
+{
+	K_SPINLOCK(&poweron_main_lock) {
+		if (sys_slist_len(&poweron_main_list) == 0) {
+			LOG_DBG("%s forced on", "main domain");
+			NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
+			NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_AlwaysOn;
+		}
+
+		sys_slist_find_and_remove(&poweron_main_list, &sink->node);
+		sys_slist_append(&poweron_main_list, &sink->node);
+	}
+}
+
+void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink)
+{
+	K_SPINLOCK(&poweron_main_lock) {
+		if (!sys_slist_find_and_remove(&poweron_main_list, &sink->node)) {
+			K_SPINLOCK_BREAK;
+		}
+
+		if (sys_slist_len(&poweron_main_list) > 0) {
+			K_SPINLOCK_BREAK;
+		}
+
+		LOG_DBG("%s automatic", "main domain");
+		NRF_LRCCONF010->POWERON &= ~LRCCONF_POWERON_MAIN_Msk;
+		NRF_LRCCONF010->POWERON |= LRCCONF_POWERON_MAIN_Automatic;
+	}
+}

drivers/clock_control/clock_control_nrf2_common.h

@@ -75,4 +75,14 @@ void clock_config_update_end(void *clk_cfg, int status);
 
 int api_nosys_on_off(const struct device *dev, clock_control_subsys_t sys);
 
+struct clock_lrcconf_sink {
+	sys_snode_t node;
+};
+
+/**
+ * @brief Request or release lrcconf main power domain
+ */
+void clock_request_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
+void clock_release_lrcconf_poweron_main(struct clock_lrcconf_sink *sink);
+
 #endif /* ZEPHYR_DRIVERS_CLOCK_CONTROL_NRF2_COMMON_H_ */

drivers/clock_control/clock_control_nrf2_fll16m.c

@@ -8,7 +8,7 @@
 #include "clock_control_nrf2_common.h"
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <soc_lrcconf.h>
+#include <hal/nrf_lrcconf.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
@@ -64,7 +64,7 @@ static const struct clock_options {
 struct fll16m_dev_data {
 	STRUCT_CLOCK_CONFIG(fll16m, ARRAY_SIZE(clock_options)) clk_cfg;
 	struct onoff_client hfxo_cli;
-	sys_snode_t fll16m_node;
+	struct clock_lrcconf_sink lrcconf_sink;
 };
 
 struct fll16m_dev_config {
@@ -76,13 +76,13 @@ static void activate_fll16m_mode(struct fll16m_dev_data *dev_data, uint8_t mode)
 	/* TODO: change to nrf_lrcconf_* function when such is available. */
 
 	if (mode != FLL16M_MODE_DEFAULT) {
-		soc_lrcconf_poweron_request(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
+		clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	}
 
 	NRF_LRCCONF010->CLKCTRL[0].SRC = mode;
 
 	if (mode == FLL16M_MODE_DEFAULT) {
-		soc_lrcconf_poweron_release(&dev_data->fll16m_node, NRF_LRCCONF_POWER_MAIN);
+		clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	}
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_CLKSTART_0);

drivers/clock_control/clock_control_nrf2_hfxo.c

@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
-#include <soc_lrcconf.h>
+#include <hal/nrf_lrcconf.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 	     "multiple instances not supported");
@@ -20,7 +20,7 @@ struct dev_data_hfxo {
 	struct onoff_manager mgr;
 	onoff_notify_fn notify;
 	struct k_timer timer;
-	sys_snode_t hfxo_node;
+	struct clock_lrcconf_sink lrcconf_sink;
 };
 
 struct dev_config_hfxo {
@@ -58,7 +58,7 @@ static void onoff_start_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 	dev_data->notify = notify;
 
 	nrf_lrcconf_event_clear(NRF_LRCCONF010, NRF_LRCCONF_EVENT_HFXOSTARTED);
-	soc_lrcconf_poweron_request(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	clock_request_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_REQHFXO);
 
 	/* Due to a hardware issue, the HFXOSTARTED event is currently
@@ -74,7 +74,7 @@ static void onoff_stop_hfxo(struct onoff_manager *mgr, onoff_notify_fn notify)
 		CONTAINER_OF(mgr, struct dev_data_hfxo, mgr);
 
 	nrf_lrcconf_task_trigger(NRF_LRCCONF010, NRF_LRCCONF_TASK_STOPREQHFXO);
-	soc_lrcconf_poweron_release(&dev_data->hfxo_node, NRF_LRCCONF_POWER_MAIN);
+	clock_release_lrcconf_poweron_main(&dev_data->lrcconf_sink);
 	notify(mgr, 0);
 }
 

soc/nordic/common/CMakeLists.txt

@@ -12,9 +12,6 @@ if(CONFIG_ARM)
 endif()
 
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-if(CONFIG_ARM)
-  zephyr_library_sources_ifdef(CONFIG_NRF_PLATFORM_HALTIUM soc_lrcconf.c)
-endif()
 
 if((CONFIG_SOC_SERIES_NRF54HX OR CONFIG_SOC_SERIES_NRF92X) AND CONFIG_CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS)
   zephyr_library_sources(nrf54hx_nrf92x_mpu_regions.c)