all: Align to GPPI API tweaking

nordic-krch · nordic-krch · commit b21c0091f10e · 2025-11-07T09:38:01.000+01:00
There are minor updates in GPPI API. Align in places that are
affected.

Signed-off-by: Krzysztof Chruściński &lt;krzysztof.chruscinski@nordicsemi.no&gt;
diff --git a/applications/connectivity_bridge/prj.conf b/applications/connectivity_bridge/prj.conf
@@ -73,7 +73,7 @@ CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
 CONFIG_NRFX_UARTE=y
 CONFIG_NRFX_TIMER=y
-CONFIG_NRFX_PPI=y
+CONFIG_NRFX_GPPI=y
 
 CONFIG_HW_ID_LIBRARY=y
 CONFIG_RESET_ON_FATAL_ERROR=y
diff --git a/lib/fem_al/fem_al.c b/lib/fem_al/fem_al.c
@@ -361,7 +361,7 @@ static int radio_domain_nrfx_dppi_channel_alloc(uint8_t *channel)
 {
 	int ch;
 
-	ch = nrfx_gppi_channel_alloc(nrfx_gppi_domain_id_get(RADIO_DOMAIN_NRF_DPPI), channel);
+	ch = nrfx_gppi_channel_alloc(nrfx_gppi_domain_id_get(RADIO_DOMAIN_NRF_DPPI));
 	if (ch < 0) {
 		return ch;
 	}
diff --git a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_sl_lptimer_grtc_hw_task.c b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_sl_lptimer_grtc_hw_task.c
@@ -227,7 +227,7 @@ void nrf_802154_platform_sl_lptimer_hw_task_local_domain_connections_clear(void)
 #elif defined(NRF54L_SERIES)
 
 #include <helpers/nrfx_gppi.h>
-#include <helpers/nrfx_gppi_lumos.h>
+#include <soc/interconnect/nrfx_gppi_lumos.h>
 
 /* To trigger RADIO.TASKS_x with GRTC.EVENT_CAPTURE{?}, the following connection chain must be
  * created:
diff --git a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_timestamper.c b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_platform_timestamper.c
@@ -228,7 +228,7 @@ void nrf_802154_platform_timestamper_local_domain_connections_setup(uint32_t dpp
  */
 
 #include <helpers/nrfx_gppi.h>
-#include <helpers/nrfx_gppi_lumos.h>
+#include <soc/interconnect/nrfx_gppi_lumos.h>
 
 static nrfx_gppi_handle_t rad_peri_handle;
 
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/conn_time_sync/boards/nrf52833dk_nrf52833.conf
@@ -6,4 +6,3 @@
 
 CONFIG_NRFX_TIMER=y
 CONFIG_NRFX_RTC2=y
-CONFIG_NRFX_PPI=y
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf52840dk_nrf52840.conf b/samples/bluetooth/conn_time_sync/boards/nrf52840dk_nrf52840.conf
@@ -6,4 +6,3 @@
 
 CONFIG_NRFX_TIMER=y
 CONFIG_NRFX_RTC2=y
-CONFIG_NRFX_PPI=y
diff --git a/samples/bluetooth/conn_time_sync/src/controller_time_nrf52.c b/samples/bluetooth/conn_time_sync/src/controller_time_nrf52.c
@@ -159,12 +159,18 @@ int config_egu_trigger_on_rtc_and_timer_match(void)
 	uint32_t tep1 = nrf_egu_task_address_get(NRF_EGU0, NRF_EGU_TASK_TRIGGER0);
 	int ret;
 
-	ret = nrfx_gppi_group_alloc(&eep0, 1, &group);
+	ret = nrfx_gppi_group_alloc(nrfx_gppi_domain_id_get(eep0), &group);
 	if (ret < 0) {
 		printk("Failed allocating group\n");
 		return ret;
 	}
 
+	ret = nrfx_gppi_group_ep_add(group, eep0);
+	if (ret < 0) {
+		printk("Failed attaching an event to the group\n");
+		return ret;
+	}
+
 	ret = nrfx_gppi_conn_alloc(eep0, nrfx_gppi_group_task_en_addr(group), &ppi_on_rtc_match);
 	if (ret < 0) {
 		printk("Failed allocating for RTC match\n");
diff --git a/samples/bluetooth/conn_time_sync/src/controller_time_nrf53_app.c b/samples/bluetooth/conn_time_sync/src/controller_time_nrf53_app.c
@@ -130,12 +130,18 @@ int config_egu_trigger_on_rtc_and_timer_match(void)
 	uint32_t tep1 = nrf_egu_task_address_get(NRF_EGU0, NRF_EGU_TASK_TRIGGER0);
 	int ret;
 
-	ret = nrfx_gppi_group_alloc(&eep0, 1, &group);
+	ret = nrfx_gppi_group_alloc(nrfx_gppi_domain_id_get(eep0), &group);
 	if (ret < 0) {
 		printk("Failed allocating group\n");
 		return ret;
 	}
 
+	ret = nrfx_gppi_group_ep_add(group, eep0);
+	if (ret < 0) {
+		printk("Failed attaching an event to the group\n");
+		return ret;
+	}
+
 	ret = nrfx_gppi_conn_alloc(eep0, nrfx_gppi_group_task_en_addr(group), &ppi_on_rtc_match);
 	if (ret < 0) {
 		printk("Failed allocating for RTC match\n");
diff --git a/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/conn_time_sync/src/controller_time_nrf54.c
@@ -18,10 +18,9 @@ int controller_time_init(void)
 	int ret;
 
 	ret = nrfx_grtc_channel_alloc(&grtc_channel);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed allocating GRTC channel (ret: %d)\n",
-		       ret - NRFX_ERROR_BASE_NUM);
-		return -ENODEV;
+	if (ret < 0) {
+		printk("Failed allocating GRTC channel (ret: %d)\n", ret);
+		return ret;
 	}
 
 	nrf_grtc_sys_counter_compare_event_enable(NRF_GRTC, grtc_channel);
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/iso_time_sync/boards/nrf52833dk_nrf52833.conf
@@ -6,4 +6,3 @@
 
 CONFIG_NRFX_TIMER=y
 CONFIG_NRFX_RTC2=y
-CONFIG_NRFX_PPI=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf52840dk_nrf52840.conf b/samples/bluetooth/iso_time_sync/boards/nrf52840dk_nrf52840.conf
@@ -6,4 +6,3 @@
 
 CONFIG_NRFX_TIMER=y
 CONFIG_NRFX_RTC2=y
-CONFIG_NRFX_PPI=y
diff --git a/samples/bluetooth/iso_time_sync/src/controller_time_nrf52.c b/samples/bluetooth/iso_time_sync/src/controller_time_nrf52.c
@@ -158,12 +158,18 @@ int config_egu_trigger_on_rtc_and_timer_match(void)
 	uint32_t tep1 = nrf_egu_task_address_get(NRF_EGU0, NRF_EGU_TASK_TRIGGER0);
 	int ret;
 
-	ret = nrfx_gppi_group_alloc(&eep0, 1, &group);
+	ret = nrfx_gppi_group_alloc(nrfx_gppi_domain_id_get(eep0), &group);
 	if (ret < 0) {
 		printk("Failed allocating group\n");
 		return ret;
 	}
 
+	ret = nrfx_gppi_group_ep_add(group, eep0);
+	if (ret < 0) {
+		printk("Failed attaching an event to the group\n");
+		return ret;
+	}
+
 	ret = nrfx_gppi_conn_alloc(eep0, nrfx_gppi_group_task_en_addr(group), &ppi_on_rtc_match);
 	if (ret < 0) {
 		printk("Failed allocating for RTC match\n");
diff --git a/samples/bluetooth/iso_time_sync/src/controller_time_nrf53_app.c b/samples/bluetooth/iso_time_sync/src/controller_time_nrf53_app.c
@@ -131,12 +131,18 @@ int config_egu_trigger_on_rtc_and_timer_match(void)
 	uint32_t tep1 = nrf_egu_task_address_get(NRF_EGU0, NRF_EGU_TASK_TRIGGER0);
 	int ret;
 
-	ret = nrfx_gppi_group_alloc(&eep0, 1, &group);
+	ret = nrfx_gppi_group_alloc(nrfx_gppi_domain_id_get(eep0), &group);
 	if (ret < 0) {
 		printk("Failed allocating group\n");
 		return ret;
 	}
 
+	ret = nrfx_gppi_group_ep_add(group, eep0);
+	if (ret < 0) {
+		printk("Failed attaching an event to the group\n");
+		return ret;
+	}
+
 	ret = nrfx_gppi_conn_alloc(eep0, nrfx_gppi_group_task_en_addr(group), &ppi_on_rtc_match);
 	if (ret < 0) {
 		printk("Failed allocating for RTC match\n");
diff --git a/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c b/samples/bluetooth/iso_time_sync/src/controller_time_nrf54.c
@@ -18,10 +18,9 @@ int controller_time_init(void)
 	int ret;
 
 	ret = nrfx_grtc_channel_alloc(&grtc_channel);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed allocating GRTC channel (ret: %d)\n",
-		       ret - NRFX_ERROR_BASE_NUM);
-		return -ENODEV;
+	if (ret < 0) {
+		printk("Failed allocating GRTC channel (ret: %d)\n", ret);
+		return ret;
 	}
 
 	nrf_grtc_sys_counter_compare_event_enable(NRF_GRTC, grtc_channel);
diff --git a/samples/peripheral/802154_phy_test/src/rf_proc.c b/samples/peripheral/802154_phy_test/src/rf_proc.c
@@ -140,14 +140,18 @@ static void configure_antenna_diversity(void)
 {
 	nrfx_gpiote_t *gpiote = &GPIOTE_NRFX_INST_BY_NODE(DT_NODELABEL(gpiote0));
 	NRF_TIMER_Type *ad_timer = NRF_TIMER3;
+	int rv;
 
 	nrf_802154_sl_ant_div_cfg_t cfg = {
 		.ant_sel_pin = CONFIG_PTT_ANT_PIN,
 		.toggle_time = CONFIG_PTT_ANT_TOGGLE_TIME,
 		.p_timer = ad_timer
 	};
 
-	(void)nrfx_gppi_channel_alloc(0 ,&cfg.ppi_ch);
+	rv = nrfx_gppi_channel_alloc(0);
+	__ASSERT_NO_MSG(rv >= 0);
+	cfg.ppi_ch = (uint8_t)rv;
+
 	(void)nrfx_gpiote_channel_alloc(gpiote, &cfg.gpiote_ch);
 	nrf_802154_sl_ant_div_mode_t ant_div_auto = 0x02;
 
diff --git a/subsys/esb/esb_dppi.c b/subsys/esb/esb_dppi.c
@@ -217,51 +217,51 @@ int esb_ppi_init(void)
 	ARG_UNUSED(err);
 
 #else
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	radio_address_timer_stop = (uint8_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	timer_compare0_radio_disable = (uint8_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	timer_compare1_radio_txen = (uint8_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	disabled_phy_end_egu = (uint8_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	egu_timer_start = (uint8_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_channel_alloc(domain_id);
 	if (ch < 0) {
 		goto error;
 	}
 	egu_ramp_up = (uint8_t)ch;
 
 	if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
-		ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+		ch = nrfx_gppi_channel_alloc(domain_id);
 		if (ch < 0) {
 			goto error;
 		}
 		radio_end_timer_start = (uint8_t)ch;
 	}
 
-	ch = nrfx_gppi_group_channel_alloc(domain_id, NULL);
+	ch = nrfx_gppi_group_channel_alloc(domain_id);
 	if (ch < 0) {
 		LOG_ERR("gppi_group_alloc failed with: %d\n", ch);
 		return ch;
diff --git a/subsys/esb/esb_ppi.c b/subsys/esb/esb_ppi.c
@@ -187,51 +187,51 @@ int esb_ppi_init(void)
 {
 	int ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	egu_ramp_up = (nrf_ppi_channel_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	disabled_egu = (nrf_ppi_channel_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	egu_timer_start = (nrf_ppi_channel_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	radio_address_timer_stop = (nrf_ppi_channel_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	timer_compare0_radio_disable = (nrf_ppi_channel_t)ch;
 
-	ch = nrfx_gppi_channel_alloc(0, NULL);
+	ch = nrfx_gppi_channel_alloc(0);
 	if (ch < 0) {
 		goto error;
 	}
 	timer_compare1_radio_txen = (nrf_ppi_channel_t)ch;
 
 	if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
-		ch = nrfx_gppi_channel_alloc(0, NULL);
+		ch = nrfx_gppi_channel_alloc(0);
 		if (ch < 0) {
 			goto error;
 		}
 		radio_end_timer_start = (nrf_ppi_channel_t)ch;
 	}
 
-	ch = nrfx_gppi_group_channel_alloc(0, NULL);
+	ch = nrfx_gppi_group_channel_alloc(0);
 	if (ch < 0) {
 		LOG_ERR("gppi_group_alloc failed with: %d\n", ch);
 		return ch;
diff --git a/subsys/gazell/Kconfig b/subsys/gazell/Kconfig
@@ -7,7 +7,7 @@
 menuconfig GAZELL
 	bool "Gazell"
 	depends on GZLL && CLOCK_CONTROL_NRF
-	select NRFX_PPI if HAS_HW_NRF_PPI
+	select NRFX_GPPI
 	help
 	  Enable Gazell functionality.
 
diff --git a/subsys/mpsl/fem/common/mpsl_fem_utils.c b/subsys/mpsl/fem/common/mpsl_fem_utils.c
@@ -20,7 +20,7 @@ int mpsl_fem_utils_ppi_channel_alloc(uint8_t *ppi_channels, size_t size)
 #endif
 
 	for (int i = 0; i < size; i++) {
-		ch = nrfx_gppi_channel_alloc(domain_id, NULL);
+		ch = nrfx_gppi_channel_alloc(domain_id);
 		if (ch < 0) {
 			return ch;
 		}
diff --git a/subsys/mpsl/hwres/mpsl_dppi.c b/subsys/mpsl/hwres/mpsl_dppi.c
@@ -10,7 +10,7 @@
 #if defined(DPPI_PRESENT) || defined(LUMOS_XXAA)
 static bool mpsl_hwres_channel_alloc(uint32_t node_id, uint8_t *p_ch)
 {
-	int ch = nrfx_gppi_channel_alloc(node_id, NULL);
+	int ch = nrfx_gppi_channel_alloc(node_id);
 
 	if (ch < 0) {
 		return false;
@@ -32,7 +32,7 @@ bool mpsl_hwres_dppi_channel_alloc(NRF_DPPIC_Type *p_dppic, uint8_t *p_dppi_ch)
 #if defined(PPIB_PRESENT)
 
 #if defined(LUMOS_XXAA)
-#include <helpers/nrfx_gppi_lumos.h>
+#include <soc/interconnect/nrfx_gppi_lumos.h>
 static uint32_t ppib_get_domain(NRF_PPIB_Type *p_ppib)
 {
 	switch ((uint32_t)p_ppib) {

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ static int radio_domain_nrfx_dppi_channel_alloc(uint8_t *channel)`
`361`	`361`	`{`
`362`	`362`	`int ch;`
`363`	`363`
`364`		`- ch = nrfx_gppi_channel_alloc(nrfx_gppi_domain_id_get(RADIO_DOMAIN_NRF_DPPI), channel);`
	`364`	`+ ch = nrfx_gppi_channel_alloc(nrfx_gppi_domain_id_get(RADIO_DOMAIN_NRF_DPPI));`
`365`	`365`	`if (ch < 0) {`
`366`	`366`	`return ch;`
`367`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@`
`6`	`6`
`7`	`7`	`CONFIG_NRFX_TIMER=y`
`8`	`8`	`CONFIG_NRFX_RTC2=y`
`9`		`-CONFIG_NRFX_PPI=y`