[nrf fromlist] samples: uac2_explicit_feedback: align to nrfx_gpiote with extracted cb

GPIOTE driver instances are no longer defined within nrfx.

Upstream PR #: 98527

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

Author: nika-nordic

samples/subsys/usb/uac2_explicit_feedback/src/feedback_nrf.c

@@ -9,6 +9,7 @@
 #include "feedback.h"
 
 #include <nrfx_gpiote.h>
+#include <gpiote_nrfx.h>
 #include <nrfx_timer.h>
 #include <hal/nrf_gpio.h>
 #include <helpers/nrfx_gppi.h>
@@ -59,8 +60,7 @@ static inline void feedback_target_init(void)
 #error "Unsupported target"
 #endif
 
-static const nrfx_gpiote_t gpiote =
-	NRFX_GPIOTE_INSTANCE(FEEDBACK_GPIOTE_INSTANCE_NUMBER);
+#define FEEDBACK_GPIOTE_NODE DT_NODELABEL(UTIL_CAT(gpiote, FEEDBACK_GPIOTE_INSTANCE_NUMBER))
 
 static nrfx_timer_t feedback_timer_instance =
 	NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(FEEDBACK_TIMER_INSTANCE_NUMBER));
@@ -117,11 +117,11 @@ static struct feedback_ctx {
 	};
 } fb_ctx;
 
-static nrfx_err_t feedback_edge_counter_setup(void)
+static int feedback_edge_counter_setup(void)
 {
-	nrfx_err_t err;
 	uint8_t feedback_gpiote_channel;
 	nrfx_gppi_handle_t feedback_gppi_handle;
+	nrfx_gpiote_t *gpiote = &GPIOTE_NRFX_INST_BY_NODE(FEEDBACK_GPIOTE_NODE);
 	nrfx_gpiote_trigger_config_t trigger_config = {
 		.trigger = NRFX_GPIOTE_TRIGGER_TOGGLE,
 		.p_in_channel = &feedback_gpiote_channel,
@@ -133,13 +133,13 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 	};
 	int rv;
 
-	err = nrfx_gpiote_channel_alloc(&gpiote, &feedback_gpiote_channel);
-	if (err != NRFX_SUCCESS) {
-		return err;
+	rv = nrfx_gpiote_channel_alloc(gpiote, &feedback_gpiote_channel);
+	if (rv != 0) {
+		return rv;
 	}
 
-	nrfx_gpiote_input_configure(&gpiote, FEEDBACK_PIN, &input_pin_config);
-	nrfx_gpiote_trigger_enable(&gpiote, FEEDBACK_PIN, false);
+	nrfx_gpiote_input_configure(gpiote, FEEDBACK_PIN, &input_pin_config);
+	nrfx_gpiote_trigger_enable(gpiote, FEEDBACK_PIN, false);
 
 	/* Configure TIMER in COUNTER mode */
 	const nrfx_timer_config_t cfg = {
@@ -150,14 +150,14 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 		.p_context = NULL,
 	};
 
-	err = nrfx_timer_init(&feedback_timer_instance, &cfg, NULL);
-	if (err != NRFX_SUCCESS) {
-		LOG_ERR("nrfx timer init error (sample clk feedback) - Return value: %d", err);
-		return err;
+	rv = nrfx_timer_init(&feedback_timer_instance, &cfg, NULL);
+	if (rv != 0) {
+		LOG_ERR("nrfx timer init error (sample clk feedback) - Return value: %d", rv);
+		return rv;
 	}
 
 	/* Subscribe TIMER COUNT task to GPIOTE IN event */
-	uint32_t eep = nrfx_gpiote_in_event_address_get(&gpiote, FEEDBACK_PIN);
+	uint32_t eep = nrfx_gpiote_in_event_address_get(gpiote, FEEDBACK_PIN);
 	uint32_t tep = nrfx_timer_task_address_get(&feedback_timer_instance, NRF_TIMER_TASK_COUNT);
 
 	rv = nrfx_gppi_conn_alloc(eep, tep, &feedback_gppi_handle);
@@ -168,12 +168,12 @@ static nrfx_err_t feedback_edge_counter_setup(void)
 
 	nrfx_gppi_conn_enable(feedback_gppi_handle);
 
-	return NRFX_SUCCESS;
+	return 0;
 }
 
-static nrfx_err_t feedback_relative_timer_setup(void)
+static int feedback_relative_timer_setup(void)
 {
-	nrfx_err_t err;
+	int err;
 	const nrfx_timer_config_t cfg = {
 		.frequency = NRFX_MHZ_TO_HZ(16UL),
 		.mode = NRF_TIMER_MODE_TIMER,
@@ -183,7 +183,7 @@ static nrfx_err_t feedback_relative_timer_setup(void)
 	};
 
 	err = nrfx_timer_init(&feedback_timer_instance, &cfg, NULL);
-	if (err != NRFX_SUCCESS) {
+	if (err != 0) {
 		LOG_ERR("nrfx timer init error (relative timer) - Return value: %d", err);
 	}
 
@@ -192,7 +192,6 @@ static nrfx_err_t feedback_relative_timer_setup(void)
 
 struct feedback_ctx *feedback_init(void)
 {
-	nrfx_err_t err;
 	nrfx_gppi_handle_t usbd_sof_gppi_handle;
 	nrfx_gppi_handle_t i2s_framestart_gppi_handle;
 	int rv;
@@ -202,12 +201,12 @@ struct feedback_ctx *feedback_init(void)
 	feedback_reset_ctx(&fb_ctx, false);
 
 	if (IS_ENABLED(CONFIG_APP_USE_I2S_LRCLK_EDGES_COUNTER)) {
-		err = feedback_edge_counter_setup();
+		rv = feedback_edge_counter_setup();
 	} else {
-		err = feedback_relative_timer_setup();
+		rv = feedback_relative_timer_setup();
 	}
 
-	if (err != NRFX_SUCCESS) {
+	if (rv != 0) {
 		return &fb_ctx;
 	}