Revert "[nrf fromlist] drivers: spi: nrfx_spim: Add support for device PM"

This reverts commit 4fe89b2.

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

Author: adamkondraciuk

drivers/spi/spi_nrfx_spim.c

@@ -8,7 +8,6 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/cache.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/pm/device_runtime.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <soc.h>
@@ -141,56 +140,15 @@ static inline nrf_spim_bit_order_t get_nrf_spim_bit_order(uint16_t operation)
 	}
 }
 
-static int spim_init(const struct device *dev)
-{
-	struct spi_nrfx_data *dev_data = dev->data;
-	const struct spi_nrfx_config *dev_config = dev->config;
-	nrfx_spim_config_t config;
-	struct spi_context *ctx = &dev_data->ctx;
-	const struct spi_config *spi_cfg = ctx->config;
-	uint32_t max_freq = dev_config->max_freq;
-	nrfx_err_t result = NRFX_SUCCESS;
-
-#if defined(CONFIG_SOC_NRF5340_CPUAPP)
-	/* On nRF5340, the 32 Mbps speed is supported by the application core
-	 * when it is running at 128 MHz (see the Timing specifications section
-	 * in the nRF5340 PS).
-	 */
-	if (max_freq > 16000000 &&
-	    nrf_clock_hfclk_div_get(NRF_CLOCK) != NRF_CLOCK_HFCLK_DIV_1) {
-		max_freq = 16000000;
-	}
-#endif
-
-	config = dev_config->def_config;
-
-	/* Limit the frequency to that supported by the SPIM instance. */
-	config.frequency = get_nrf_spim_frequency(MIN(spi_cfg->frequency,
-						max_freq));
-	config.mode      = get_nrf_spim_mode(spi_cfg->operation);
-	config.bit_order = get_nrf_spim_bit_order(spi_cfg->operation);
-
-	if (dev_data->initialized) {
-		nrfx_spim_uninit(&dev_config->spim);
-		dev_data->initialized = false;
-	}
-
-	result = nrfx_spim_init(&dev_config->spim, &config,
-			event_handler, (void *)dev);
-	if (result != NRFX_SUCCESS) {
-		LOG_ERR("Failed to initialize nrfx driver: %08x", result);
-		return -EIO;
-	}
-	return 0;
-}
-
 static int configure(const struct device *dev,
 		     const struct spi_config *spi_cfg)
 {
 	struct spi_nrfx_data *dev_data = dev->data;
 	const struct spi_nrfx_config *dev_config = dev->config;
 	struct spi_context *ctx = &dev_data->ctx;
-	int ret;
+	uint32_t max_freq = dev_config->max_freq;
+	nrfx_spim_config_t config;
+	nrfx_err_t result;
 
 	if (dev_data->initialized && spi_context_configured(ctx, spi_cfg)) {
 		/* Already configured. No need to do it again. */
@@ -228,22 +186,44 @@ static int configure(const struct device *dev,
 		return -EINVAL;
 	}
 
+#if defined(CONFIG_SOC_NRF5340_CPUAPP)
+	/* On nRF5340, the 32 Mbps speed is supported by the application core
+	 * when it is running at 128 MHz (see the Timing specifications section
+	 * in the nRF5340 PS).
+	 */
+	if (max_freq > 16000000 &&
+	    nrf_clock_hfclk_div_get(NRF_CLOCK) != NRF_CLOCK_HFCLK_DIV_1) {
+		max_freq = 16000000;
+	}
+#endif
+
+	config = dev_config->def_config;
+
+	/* Limit the frequency to that supported by the SPIM instance. */
+	config.frequency = get_nrf_spim_frequency(MIN(spi_cfg->frequency,
+						      max_freq));
+	config.mode      = get_nrf_spim_mode(spi_cfg->operation);
+	config.bit_order = get_nrf_spim_bit_order(spi_cfg->operation);
+
 	nrfy_gpio_pin_write(nrfy_spim_sck_pin_get(dev_config->spim.p_reg),
 			    spi_cfg->operation & SPI_MODE_CPOL ? 1 : 0);
 
-	ctx->config = spi_cfg;
-#ifdef CONFIG_PM_DEVICE_RUNTIME
-	ret = pm_device_runtime_get(dev);
-#else
-	ret = spim_init(dev);
-#endif
-	if (ret < 0) {
+	if (dev_data->initialized) {
+		nrfx_spim_uninit(&dev_config->spim);
+		dev_data->initialized = false;
+	}
 
-		return ret;
+	result = nrfx_spim_init(&dev_config->spim, &config,
+				event_handler, (void *)dev);
+	if (result != NRFX_SUCCESS) {
+		LOG_ERR("Failed to initialize nrfx driver: %08x", result);
+		return -EIO;
 	}
 
 	dev_data->initialized = true;
 
+	ctx->config = spi_cfg;
+
 	return 0;
 }
 
@@ -341,7 +321,6 @@ static void finish_transaction(const struct device *dev, int error)
 	dev_data->busy = false;
 
 	finalize_spi_transaction(dev, true);
-	(void)pm_device_runtime_put(dev);
 }
 
 static void transfer_next_chunk(const struct device *dev)
@@ -604,7 +583,9 @@ static int spim_nrfx_pm_action(const struct device *dev,
 		if (ret < 0) {
 			return ret;
 		}
-		ret = spim_init(dev);
+		/* nrfx_spim_init() will be called at configuration before
+		 * the next transfer.
+		 */
 		break;
 
 	case PM_DEVICE_ACTION_SUSPEND:
@@ -635,10 +616,7 @@ static int spi_nrfx_init(const struct device *dev)
 	struct spi_nrfx_data *dev_data = dev->data;
 	int err;
 
-	err = pinctrl_apply_state(dev_config->pcfg,
-				  COND_CODE_1(CONFIG_PM_DEVICE_RUNTIME,
-					      (PINCTRL_STATE_SLEEP),
-					      (PINCTRL_STATE_DEFAULT)));
+	err = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
 	if (err < 0) {
 		return err;
 	}
@@ -664,11 +642,6 @@ static int spi_nrfx_init(const struct device *dev)
 
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
-#ifdef CONFIG_PM_DEVICE_RUNTIME
-	pm_device_init_suspended(dev);
-	pm_device_runtime_enable(dev);
-#endif
-
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
 	return anomaly_58_workaround_init(dev);
 #else