Device deinit driver support

drivers/gpio/gpio_nrfx.c

@@ -64,20 +64,15 @@ static nrf_gpio_pin_pull_t get_pull(gpio_flags_t flags)
 	return NRF_GPIO_PIN_NOPULL;
 }
 
-static void gpio_nrfx_gpd_retain_set(const struct device *port, uint32_t mask, gpio_flags_t flags)
+static void gpio_nrfx_gpd_retain_set(const struct device *port, uint32_t mask)
 {
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
 
-	if (cfg->pad_pd != NRF_GPD_FAST_ACTIVE1 || !(flags & GPIO_OUTPUT)) {
-		return;
-	}
-
 	nrf_gpio_port_retain_enable(cfg->port, mask);
 #else
 	ARG_UNUSED(port);
 	ARG_UNUSED(mask);
-	ARG_UNUSED(flags);
 #endif
 }
 
@@ -86,10 +81,6 @@ static void gpio_nrfx_gpd_retain_clear(const struct device *port, uint32_t mask)
 #ifdef CONFIG_SOC_NRF54H20_GPD
 	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
 
-	if (cfg->pad_pd != NRF_GPD_FAST_ACTIVE1) {
-		return;
-	}
-
 	nrf_gpio_port_retain_disable(cfg->port, mask);
 #else
 	ARG_UNUSED(port);
@@ -225,7 +216,7 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 	}
 
 end:
-	gpio_nrfx_gpd_retain_set(port, BIT(pin), flags);
+	gpio_nrfx_gpd_retain_set(port, BIT(pin));
 	return pm_device_runtime_put(port);
 }
 
@@ -329,7 +320,7 @@ static int gpio_nrfx_port_set_masked_raw(const struct device *port,
 	gpio_nrfx_gpd_retain_clear(port, mask);
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
-	gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	gpio_nrfx_gpd_retain_set(port, mask);
 	return pm_device_runtime_put(port);
 }
 
@@ -346,7 +337,7 @@ static int gpio_nrfx_port_set_bits_raw(const struct device *port,
 
 	gpio_nrfx_gpd_retain_clear(port, mask);
 	nrf_gpio_port_out_set(reg, mask);
-	gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	gpio_nrfx_gpd_retain_set(port, mask);
 	return pm_device_runtime_put(port);
 }
 
@@ -363,7 +354,7 @@ static int gpio_nrfx_port_clear_bits_raw(const struct device *port,
 
 	gpio_nrfx_gpd_retain_clear(port, mask);
 	nrf_gpio_port_out_clear(reg, mask);
-	gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	gpio_nrfx_gpd_retain_set(port, mask);
 	return pm_device_runtime_put(port);
 }
 
@@ -384,7 +375,7 @@ static int gpio_nrfx_port_toggle_bits(const struct device *port,
 	gpio_nrfx_gpd_retain_clear(port, mask);
 	nrf_gpio_port_out_set(reg, set_mask);
 	nrf_gpio_port_out_clear(reg, clear_mask);
-	gpio_nrfx_gpd_retain_set(port, mask, GPIO_OUTPUT);
+	gpio_nrfx_gpd_retain_set(port, mask);
 	return pm_device_runtime_put(port);
 }
 

drivers/i2c/i2c_nrfx_twim.c

@@ -224,6 +224,11 @@
 	return i2c_nrfx_twim_common_init(dev);
 }
 
+static int i2c_nrfx_twim_deinit(const struct device *dev)
+{
+	return i2c_nrfx_twim_common_deinit(dev);
+}
+
 static DEVICE_API(i2c, i2c_nrfx_twim_driver_api) = {
 	.configure = i2c_nrfx_twim_configure,
 	.transfer = i2c_nrfx_twim_transfer,
@@ -280,15 +285,16 @@
 	};								       \
 	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action,                     \
 			PM_DEVICE_ISR_SAFE);                                   \
-	I2C_DEVICE_DT_DEFINE(I2C(idx),					       \
+	I2C_DEVICE_DT_DEINIT_DEFINE(I2C(idx),				       \
 		      i2c_nrfx_twim_init,				       \
+		      i2c_nrfx_twim_deinit,				       \
 		      PM_DEVICE_DT_GET(I2C(idx)),			       \
 		      &twim_##idx##_data,				       \
 		      &twim_##idx##z_config,				       \
 		      POST_KERNEL,					       \
 		      CONFIG_I2C_INIT_PRIORITY,				       \
 		      &i2c_nrfx_twim_driver_api)
 
 #define I2C_MEMORY_SECTION(idx)						       \
 	COND_CODE_1(I2C_HAS_PROP(idx, memory_regions),			       \
 		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	       \

drivers/i2c/i2c_nrfx_twim_common.c

@@ -102,18 +102,30 @@
 	return ret;
 }
 
-int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+void twim_nrfx_pm_resume(const struct device *dev)
 {
 	const struct i2c_nrfx_twim_common_config *config = dev->config;
 
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	nrfx_twim_enable(&config->twim);
+}
+
+void twim_nrfx_pm_suspend(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+
+	nrfx_twim_disable(&config->twim);
+	(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+}
+
+int twim_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-		nrfx_twim_enable(&config->twim);
+		twim_nrfx_pm_resume(dev);
 		break;
 	case PM_DEVICE_ACTION_SUSPEND:
-		nrfx_twim_disable(&config->twim);
-		(void)pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		twim_nrfx_pm_suspend(dev);
 		break;
 	default:
 		return -ENOTSUP;
@@ -138,3 +150,31 @@
 
 	return pm_device_driver_init(dev, twim_nrfx_pm_action);
 }
+
+int i2c_nrfx_twim_common_deinit(const struct device *dev)
+{
+	const struct i2c_nrfx_twim_common_config *config = dev->config;
+#if CONFIG_PM_DEVICE
+	enum pm_device_state state;
+#endif
+
+#if CONFIG_PM_DEVICE
+	/*
+	 * PM must have suspended the device before driver can
+	 * be deinitialized
+	 */
+	(void)pm_device_state_get(dev, &state);
+	if (state != PM_DEVICE_STATE_SUSPENDED &&
+	    state != PM_DEVICE_STATE_OFF) {
+		LOG_ERR("device active");
+		return -EBUSY;
+	}
+#else
+	/* Suspend device */
+	twim_nrfx_pm_suspend(dev);
+#endif
+
+	/* Uninit device hardware */
+	nrfx_twim_uninit(&config->twim);
+	return 0;
+}

drivers/i2c/i2c_nrfx_twim_common.h

@@ -43,6 +43,7 @@ struct i2c_nrfx_twim_common_config {
 };
 
 int i2c_nrfx_twim_common_init(const struct device *dev);
+int i2c_nrfx_twim_common_deinit(const struct device *dev);
 int i2c_nrfx_twim_configure(const struct device *dev, uint32_t i2c_config);
 int i2c_nrfx_twim_recover_bus(const struct device *dev);
 int i2c_nrfx_twim_msg_transfer(const struct device *dev, uint8_t flags, uint8_t *buf,

drivers/i2c/i2c_nrfx_twim_rtio.c

@@ -203,14 +203,19 @@
 	.iodev_submit = i2c_nrfx_twim_rtio_submit,
 };
 
-int i2c_nrfx_twim_rtio_init(const struct device *dev)
+static int i2c_nrfx_twim_rtio_init(const struct device *dev)
 {
 	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
 
 	i2c_rtio_init(config->ctx, dev);
 	return i2c_nrfx_twim_common_init(dev);
 }
 
+static int i2c_nrfx_twim_rtio_deinit(const struct device *dev)
+{
+	return i2c_nrfx_twim_common_deinit(dev);
+}
+
 #define CONCAT_BUF_SIZE(idx)                                                                       \
 	COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size),                            \
 		    (DT_PROP(I2C(idx), zephyr_concat_buf_size)), (0))
@@ -282,10 +287,11 @@
 		.ctx = &_i2c##idx##_twim_rtio,                                                     \
 	};                                                                                         \
 	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action, PM_DEVICE_ISR_SAFE);                    \
-	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)),        \
-			     &twim_##idx##z_data, &twim_##idx##z_config, POST_KERNEL,              \
-			     CONFIG_I2C_INIT_PRIORITY, &i2c_nrfx_twim_driver_api);
+	I2C_DEVICE_DT_DEINIT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, i2c_nrfx_twim_rtio_deinit,  \
+			     PM_DEVICE_DT_GET(I2C(idx)), &twim_##idx##z_data,                      \
+			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
+			     &i2c_nrfx_twim_driver_api);
 
 #ifdef CONFIG_HAS_HW_NRF_TWIM0
 I2C_NRFX_TWIM_RTIO_DEVICE(0);
 #endif

drivers/i2c/i2c_nrfx_twis.c

@@ -73,6 +73,15 @@
 	(void)pm_device_state_get(dev, &state);
 	return state == PM_DEVICE_STATE_ACTIVE;
 }
+
+static bool shim_nrf_twis_is_suspended(const struct device *dev)
+{
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(dev, &state);
+	return state == PM_DEVICE_STATE_SUSPENDED ||
+	       state == PM_DEVICE_STATE_OFF;
+}
 #else
 static bool shim_nrf_twis_is_resumed(const struct device *dev)
 {
@@ -199,7 +208,7 @@
 
 #if CONFIG_PM_DEVICE
 	case PM_DEVICE_ACTION_SUSPEND:
-		shim_nrf_twis_disable();
+		shim_nrf_twis_disable(dev);
 		break;
 #endif
 
@@ -283,6 +292,35 @@
 	return pm_device_driver_init(dev, shim_nrf_twis_pm_action_cb);
 }
 
+static int shim_nrf_twis_deinit(const struct device *dev)
+{
+	const struct shim_nrf_twis_config *dev_config = dev->config;
+	struct shim_nrf_twis_data *dev_data = dev->data;
+
+	if (dev_data->target_config != NULL) {
+		LOG_ERR("target registered");
+		return -EPERM;
+	}
+
+#if CONFIG_PM_DEVICE
+	/*
+	 * PM must have suspended the device before driver can
+	 * be deinitialized
+	 */
+	if (!shim_nrf_twis_is_suspended(dev)) {
+		LOG_ERR("device active");
+		return -EBUSY;
+	}
+#else
+	/* Suspend device */
+	shim_nrf_twis_disable(dev);
+#endif
+
+	/* Uninit device hardware */
+	nrfx_twis_uninit(&dev_config->twis);
+	return 0;
+}
+
 #define SHIM_NRF_TWIS_NAME(id, name) \
 	_CONCAT_4(shim_nrf_twis_, name, _, id)
 
@@ -323,9 +361,10 @@
 		shim_nrf_twis_pm_action_cb,							\
 	);											\
 												\
-	DEVICE_DT_DEFINE(									\
+	DEVICE_DT_DEINIT_DEFINE(								\
 		SHIM_NRF_TWIS_NODE(id),								\
 		shim_nrf_twis_init,								\
+		shim_nrf_twis_deinit,								\
 		PM_DEVICE_DT_GET(SHIM_NRF_TWIS_NODE(id)),					\
 		&SHIM_NRF_TWIS_NAME(id, data),							\
 		&SHIM_NRF_TWIS_NAME(id, config),						\
@@ -333,7 +372,7 @@
 		CONFIG_I2C_INIT_PRIORITY,							\
 		&shim_nrf_twis_api								\
 	);
 
 #ifdef CONFIG_HAS_HW_NRF_TWIS0
 SHIM_NRF_TWIS_DEVICE_DEFINE(0);
 #endif

drivers/pinctrl/pinctrl_nrf.c

@@ -516,9 +516,13 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 					}
 					gpd_requested = true;
 				}
-
-				nrf_gpio_pin_retain_disable(pin);
 			}
+
+			/*
+			 * Pad power domain now on, retain no longer needed
+			 * as pad config will be persists as pad is powered.
+			 */
+			nrf_gpio_pin_retain_disable(pin);
 #endif /* CONFIG_SOC_NRF54H20_GPD */
 
 			if (write != NO_WRITE) {
@@ -537,7 +541,13 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			nrf_gpio_pin_clock_set(pin, NRF_GET_CLOCKPIN_ENABLE(pins[i]));
 #endif
 #ifdef CONFIG_SOC_NRF54H20_GPD
-			if (NRF_GET_GPD_FAST_ACTIVE1(pins[i]) == 1U) {
+			if (NRF_GET_LP(pins[i]) == NRF_LP_ENABLE) {
+				/*
+				 * Pad power domain may be turned off, and pad is not
+				 * actively used as pincnf is low-power. Enable retain
+				 * to ensure pad output and config persists if pad
+				 * power domain is suspended.
+				 */
 				nrf_gpio_pin_retain_enable(pin);
 			}
 #endif /* CONFIG_SOC_NRF54H20_GPD */

drivers/spi/spi_nrfx_spim.c

@@ -765,6 +765,28 @@
 #endif
 	return pm_device_driver_init(dev, spim_nrfx_pm_action);
 }
+
+static int spi_nrfx_deinit(const struct device *dev)
+{
+#if defined(CONFIG_PM_DEVICE)
+	enum pm_device_state state;
+
+	/*
+	 * PM must have suspended the device before driver can
+	 * be deinitialized
+	 */
+	(void)pm_device_state_get(dev, &state);
+	return state == PM_DEVICE_STATE_SUSPENDED ||
+	       state == PM_DEVICE_STATE_OFF ?
+	       0 : -EBUSY;
+#else
+	/* PM suspend implementation does everything we need */
+	spim_suspend(dev);
+#endif
+
+	return 0;
+}
+
 /*
  * We use NODELABEL here because the nrfx API requires us to call
  * functions which are named according to SoC peripheral instance
@@ -870,14 +892,15 @@
 		     !(DT_GPIO_FLAGS(SPIM(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
 		     "WAKE line must be configured as active high");	       \
 	PM_DEVICE_DT_DEFINE(SPIM(idx), spim_nrfx_pm_action);		       \
-	SPI_DEVICE_DT_DEFINE(SPIM(idx),					       \
+	SPI_DEVICE_DT_DEINIT_DEFINE(SPIM(idx),				       \
 		      spi_nrfx_init,					       \
+		      spi_nrfx_deinit,					       \
 		      PM_DEVICE_DT_GET(SPIM(idx)),			       \
 		      &spi_##idx##_data,				       \
 		      &spi_##idx##z_config,				       \
 		      POST_KERNEL, SPIM_INIT_PRIORITY(idx),		       \
 		      &spi_nrfx_driver_api)
 
 #define SPIM_MEMORY_SECTION(idx)					       \
 	COND_CODE_1(SPIM_HAS_PROP(idx, memory_regions),			       \
 		(__attribute__((__section__(LINKER_DT_NODE_REGION_NAME(	       \