[nrf fromlist] drivers: spi: nrf: align to nrfx_gpiote with extracted control block

GPIOTE driver instances are no longer defined within nrfx.

Upstream PR #: 98527

Signed-off-by: Nikodem Kastelik <[email protected]>

Author: nika-nordic

drivers/spi/spi_nrfx_common.c

@@ -7,7 +7,7 @@
 #include "spi_nrfx_common.h"
 #include <zephyr/kernel.h>
 
-int spi_nrfx_wake_init(const nrfx_gpiote_t *gpiote, uint32_t wake_pin)
+int spi_nrfx_wake_init(nrfx_gpiote_t *gpiote, uint32_t wake_pin)
 {
 	nrf_gpio_pin_pull_t pull_config = NRF_GPIO_PIN_PULLDOWN;
 	uint8_t ch;
@@ -20,23 +20,23 @@ int spi_nrfx_wake_init(const nrfx_gpiote_t *gpiote, uint32_t wake_pin)
 		.p_trigger_config = &trigger_config,
 		.p_handler_config = NULL,
 	};
-	nrfx_err_t res;
+	int res;
 
 	res = nrfx_gpiote_channel_alloc(gpiote, &ch);
-	if (res != NRFX_SUCCESS) {
-		return -ENODEV;
+	if (res < 0) {
+		return res;
 	}
 
 	res = nrfx_gpiote_input_configure(gpiote, wake_pin, &input_config);
-	if (res != NRFX_SUCCESS) {
+	if (res < 0) {
 		nrfx_gpiote_channel_free(gpiote, ch);
-		return -EIO;
+		return res;
 	}
 
 	return 0;
 }
 
-int spi_nrfx_wake_request(const nrfx_gpiote_t *gpiote, uint32_t wake_pin)
+int spi_nrfx_wake_request(nrfx_gpiote_t *gpiote, uint32_t wake_pin)
 {
 	nrf_gpiote_event_t trigger_event = nrfx_gpiote_in_event_get(gpiote, wake_pin);
 	uint32_t start_cycles;

drivers/spi/spi_nrfx_common.h

@@ -9,16 +9,18 @@
 
 #include <stdint.h>
 #include <nrfx_gpiote.h>
+#include <gpiote_nrfx.h>
+#include <zephyr/drivers/gpio/gpio_nrf.h>
 
 #define WAKE_PIN_NOT_USED UINT32_MAX
 
-#define WAKE_GPIOTE_INSTANCE(node_id)					\
-	COND_CODE_1(DT_NODE_HAS_PROP(node_id, wake_gpios),		\
-		(NRFX_GPIOTE_INSTANCE(					\
-			NRF_DT_GPIOTE_INST(node_id, wake_gpios))),	\
-		({0}))
+#define WAKE_GPIOTE_NODE(node_id)							   \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, wake_gpios),				   \
+		    (&GPIOTE_NRFX_INST_BY_NODE(DT_PHANDLE(DT_PHANDLE(node_id, wake_gpios), \
+					       gpiote_instance))),			   \
+		    (NULL))
 
-int spi_nrfx_wake_init(const nrfx_gpiote_t *gpiote, uint32_t wake_pin);
-int spi_nrfx_wake_request(const nrfx_gpiote_t *gpiote, uint32_t wake_pin);
+int spi_nrfx_wake_init(nrfx_gpiote_t *gpiote, uint32_t wake_pin);
+int spi_nrfx_wake_request(nrfx_gpiote_t *gpiote, uint32_t wake_pin);
 
 #endif /* ZEPHYR_DRIVERS_SPI_NRFX_COMMON_H_ */

drivers/spi/spi_nrfx_spi.c

@@ -31,8 +31,8 @@ struct spi_nrfx_config {
 	nrfx_spi_config_t def_config;
 	void (*irq_connect)(void);
 	const struct pinctrl_dev_config *pcfg;
+	nrfx_gpiote_t *wake_gpiote;
 	uint32_t wake_pin;
-	nrfx_gpiote_t wake_gpiote;
 };
 
 static void event_handler(const nrfx_spi_evt_t *p_event, void *p_context);
@@ -241,7 +241,7 @@ static int transceive(const struct device *dev,
 		dev_data->busy = true;
 
 		if (dev_config->wake_pin != WAKE_PIN_NOT_USED) {
-			error = spi_nrfx_wake_request(&dev_config->wake_gpiote,
+			error = spi_nrfx_wake_request(dev_config->wake_gpiote,
 						      dev_config->wake_pin);
 			if (error == -ETIMEDOUT) {
 				LOG_WRN("Waiting for WAKE acknowledgment timed out");
@@ -395,7 +395,7 @@ static int spi_nrfx_init(const struct device *dev)
 	}
 
 	if (dev_config->wake_pin != WAKE_PIN_NOT_USED) {
-		err = spi_nrfx_wake_init(&dev_config->wake_gpiote, dev_config->wake_pin);
+		err = spi_nrfx_wake_init(dev_config->wake_gpiote, dev_config->wake_pin);
 		if (err == -ENODEV) {
 			LOG_ERR("Failed to allocate GPIOTE channel for WAKE");
 			return err;
@@ -458,9 +458,9 @@ static int spi_nrfx_init(const struct device *dev)
 		},							       \
 		.irq_connect = irq_connect##idx,			       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(SPI(idx)),		       \
+		.wake_gpiote = WAKE_GPIOTE_NODE(SPI(idx)),		       \
 		.wake_pin = NRF_DT_GPIOS_TO_PSEL_OR(SPI(idx), wake_gpios,      \
 						    WAKE_PIN_NOT_USED),	       \
-		.wake_gpiote = WAKE_GPIOTE_INSTANCE(SPI(idx)),		       \
 	};								       \
 	BUILD_ASSERT(!DT_NODE_HAS_PROP(SPI(idx), wake_gpios) ||		       \
 		     !(DT_GPIO_FLAGS(SPI(idx), wake_gpios) & GPIO_ACTIVE_LOW), \

drivers/spi/spi_nrfx_spim.c

@@ -102,8 +102,8 @@ struct spi_nrfx_config {
 	void (*irq_connect)(void);
 	uint16_t max_chunk_len;
 	const struct pinctrl_dev_config *pcfg;
+	nrfx_gpiote_t *wake_gpiote;
 	uint32_t wake_pin;
-	nrfx_gpiote_t wake_gpiote;
 #ifdef SPIM_ANY_FAST
 	const struct device *clk_dev;
 	struct nrf_clock_spec clk_spec;
@@ -512,7 +512,7 @@ static int transceive(const struct device *dev,
 		dev_data->busy = true;
 
 		if (dev_config->wake_pin != WAKE_PIN_NOT_USED) {
-			error = spi_nrfx_wake_request(&dev_config->wake_gpiote,
+			error = spi_nrfx_wake_request(dev_config->wake_gpiote,
 						      dev_config->wake_pin);
 			if (error == -ETIMEDOUT) {
 				LOG_WRN("Waiting for WAKE acknowledgment timed out");
@@ -709,7 +709,7 @@ static int spi_nrfx_init(const struct device *dev)
 	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
 
 	if (dev_config->wake_pin != WAKE_PIN_NOT_USED) {
-		err = spi_nrfx_wake_init(&dev_config->wake_gpiote, dev_config->wake_pin);
+		err = spi_nrfx_wake_init(dev_config->wake_gpiote, dev_config->wake_pin);
 		if (err == -ENODEV) {
 			LOG_ERR("Failed to allocate GPIOTE channel for WAKE");
 			return err;
@@ -808,13 +808,13 @@ static int spi_nrfx_deinit(const struct device *dev)
 			SPI_NRFX_SPIM_EXTENDED_CONFIG(inst)		       \
 		},							       \
 		.irq_connect = irq_connect##inst,			       \
-		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),		       \
 		.max_chunk_len = BIT_MASK(				       \
 			DT_INST_PROP(inst, easydma_maxcnt_bits)),	       \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),		       \
+		.wake_gpiote = WAKE_GPIOTE_NODE(DT_DRV_INST(inst)),	       \
 		.wake_pin = NRF_DT_GPIOS_TO_PSEL_OR(DT_DRV_INST(inst),	       \
 						    wake_gpios,		       \
 						    WAKE_PIN_NOT_USED),	       \
-		.wake_gpiote = WAKE_GPIOTE_INSTANCE(DT_DRV_INST(inst)),	       \
 		IF_ENABLED(SPIM_ANY_FAST,				       \
 			(.clk_dev = DEVICE_DT_GET_OR_NULL(		       \
 				DT_CLOCKS_CTLR(DT_DRV_INST(inst))),	       \