Revert "[nrf fromlist] drivers: pwm: nrfx: add global hsfll request for fast PWM"

This reverts commit 99faf47.

Signed-off-by: Michał Stasiak <[email protected]>

Author: mstasiaknordic

drivers/pwm/pwm_nrfx.c

@@ -13,9 +13,6 @@
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/cache.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
-#ifdef CONFIG_CLOCK_CONTROL
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#endif
 #ifdef CONFIG_SOC_NRF54H20_GPD
 #include <nrf/gpd.h>
 #endif
@@ -38,26 +35,6 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 #define ANOMALY_109_EGU_IRQ_CONNECT(idx)
 #endif
 
-#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
-#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
-#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
-
-#define PWM_NRFX_IS_FAST(unused, prefix, idx, _)					\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PWM(idx)),					\
-		(COND_CODE_1(PWM_HAS_PROP(idx, power_domains),				\
-		    (IS_EQ(DT_PHA(PWM(idx), power_domains, id), NRF_GPD_FAST_ACTIVE1)),	\
-		    (0))), (0))
-
-#if NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))
-#if CONFIG_CLOCK_CONTROL
-#define PWM_NRFX_USE_CLOCK_CONTROL 1
-#endif
-#define PWM_NRFX_INIT_PRIORITY 99
-#else
-#define PWM_NRFX_INIT_PRIORITY CONFIG_PWM_INIT_PRIORITY
-#endif
-
-
 #define PWM_NRFX_CH_POLARITY_MASK BIT(15)
 #define PWM_NRFX_CH_COMPARE_MASK  BIT_MASK(15)
 #define PWM_NRFX_CH_VALUE(compare_value, inverted) \
@@ -72,10 +49,6 @@ struct pwm_nrfx_config {
 #ifdef CONFIG_DCACHE
 	uint32_t mem_attr;
 #endif
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	const struct device *clk_dev;
-	struct nrf_clock_spec clk_spec;
-#endif
 };
 
 struct pwm_nrfx_data {
@@ -84,9 +57,6 @@ struct pwm_nrfx_data {
 	uint8_t  pwm_needed;
 	uint8_t  prescaler;
 	bool     stop_requested;
-#ifdef PWM_NRFX_USE_CLOCK_CONTROL
-	bool     clock_requested;
-#endif
 };
 /* Ensure the pwm_needed bit mask can accommodate all available channels. */
 #if (NRF_PWM_CHANNEL_COUNT > 8)
@@ -259,18 +229,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * ensure it is stopped before starting the next playback.
 		 */
 		nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-		if (data->clock_requested) {
-			int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-			if (ret < 0) {
-				LOG_ERR("Global HSFLL release failed: %d", ret);
-				return ret;
-			}
-
-			data->clock_requested = false;
-		}
-#endif
 		data->stop_requested = true;
 	} else {
 		if (data->stop_requested) {
@@ -290,18 +248,6 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
 		 * until another playback is requested (new values will be
 		 * loaded then) or the PWM peripheral is stopped.
 		 */
-#if PWM_NRFX_USE_CLOCK_CONTROL
-
-		int ret = nrf_clock_control_request_sync(config->clk_dev, &config->clk_spec,
-							 K_FOREVER);
-
-		if (ret < 0) {
-			LOG_ERR("Global HSFLL request failed: %d", ret);
-			return ret;
-		}
-
-		data->clock_requested = true;
-#endif
 		nrfx_pwm_simple_playback(&config->pwm, &config->seq, 1,
 					 NRFX_PWM_FLAG_NO_EVT_FINISHED);
 	}
@@ -360,14 +306,6 @@ static void pwm_suspend(const struct device *dev)
 	const struct pwm_nrfx_config *config = dev->config;
 
 	nrfx_pwm_stop(&config->pwm, false);
-#if PWM_NRFX_USE_CLOCK_CONTROL
-
-		int ret = nrf_clock_control_release(config->clk_dev, &config->clk_spec);
-
-		if (ret < 0) {
-			LOG_ERR("Global HSFLL release failed: %d", ret);
-		}
-#endif
 	while (!nrfx_pwm_stopped_check(&config->pwm)) {
 	}
 
@@ -413,6 +351,9 @@ static int pwm_nrfx_init(const struct device *dev)
 	return pm_device_driver_init(dev, pwm_nrfx_pm_action);
 }
 
+#define PWM(dev_idx) DT_NODELABEL(pwm##dev_idx)
+#define PWM_PROP(dev_idx, prop) DT_PROP(PWM(dev_idx), prop)
+#define PWM_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(PWM(idx), prop)
 #define PWM_MEM_REGION(idx)     DT_PHANDLE(PWM(idx), memory_regions)
 
 #define PWM_MEMORY_SECTION(idx)						      \
@@ -452,15 +393,6 @@ static int pwm_nrfx_init(const struct device *dev)
 			(16ul * 1000ul * 1000ul)),			      \
 		IF_ENABLED(CONFIG_DCACHE,				      \
 			(.mem_attr = PWM_GET_MEM_ATTR(idx),))		      \
-		IF_ENABLED(PWM_NRFX_USE_CLOCK_CONTROL,		      \
-			(.clk_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(PWM(idx))),  \
-			 .clk_spec = {					      \
-				.frequency =				      \
-					NRF_PERIPH_GET_FREQUENCY(PWM(idx)),   \
-				.accuracy = 0,				      \
-				.precision =				      \
-					NRF_CLOCK_CONTROL_PRECISION_DEFAULT,  \
-			 },))						      \
 	};								      \
 	static int pwm_nrfx_init##idx(const struct device *dev)		      \
 	{								      \
@@ -473,7 +405,7 @@ static int pwm_nrfx_init(const struct device *dev)
 			 pwm_nrfx_init##idx, PM_DEVICE_DT_GET(PWM(idx)),      \
 			 &pwm_nrfx_##idx##_data,			      \
 			 &pwm_nrfx_##idx##_config,			      \
-			 POST_KERNEL, PWM_NRFX_INIT_PRIORITY,		      \
+			 POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,		      \
 			 &pwm_nrfx_drv_api_funcs)
 
 #define COND_PWM_NRFX_DEVICE(unused, prefix, i, _) \