manifest: update zephyr with nrfx 4.0-rc2

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

applications/nrf5340_audio/src/modules/audio_sync_timer.c

@@ -170,17 +170,17 @@ static void rtc_isr_handler(nrfx_rtc_int_type_t int_type)
  */
 static int audio_sync_timer_init(void)
 {
-	nrfx_err_t ret;
+	int ret;
 	uint32_t eep0, tep0, tep1;
 
 	ret = nrfx_timer_init(&audio_sync_hf_timer_instance, &cfg, unused_timer_isr_handler);
-	if (ret - NRFX_ERROR_BASE_NUM) {
+	if (ret < 0) {
 		LOG_ERR("nrfx timer init error: %d", ret);
 		return -ENODEV;
 	}
 
 	ret = nrfx_rtc_init(&audio_sync_lf_timer_instance, &rtc_cfg, rtc_isr_handler);
-	if (ret - NRFX_ERROR_BASE_NUM) {
+	if (ret < 0) {
 		LOG_ERR("nrfx rtc init error: %d", ret);
 		return -ENODEV;
 	}

applications/nrf5340_audio/src/utils/peripherals.c

@@ -149,7 +149,6 @@ int peripherals_init(void)
 
 	/* Use this to turn on 128 MHz clock for cpu_app */
 	ret = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
-	ret -= NRFX_ERROR_BASE_NUM;
 	if (ret) {
 		return ret;
 	}

drivers/mpsl/clock_control/nrfx_clock_mpsl.c

@@ -38,6 +38,26 @@
 	}
 }
 
+void nrfx_clock_lfclk_start(void)
+{
+    nrfx_clock_start(NRF_CLOCK_DOMAIN_LFCLK);
+}
+
+void nrfx_clock_lfclk_stop(void)
+{
+    nrfx_clock_stop(NRF_CLOCK_DOMAIN_LFCLK);
+}
+
+void nrfx_clock_hfclk_start(void)
+{
+    nrfx_clock_start(NRF_CLOCK_DOMAIN_HFCLK);
+}
+
+void nrfx_clock_hfclk_stop(void)
+{
+    nrfx_clock_stop(NRF_CLOCK_DOMAIN_HFCLK);
+}
+
 void nrfx_clock_start(nrf_clock_domain_t domain)
 {
 	switch (domain) {
@@ -81,11 +101,11 @@
 
 }
 
-nrfx_err_t nrfx_clock_init(nrfx_clock_event_handler_t handler)
+int nrfx_clock_init(nrfx_clock_event_handler_t handler)
 {
 	event_handler = handler;
 
-	return NRFX_SUCCESS;
+	return 0;
 }
 
 

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;
 	}

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:

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;
 

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

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

samples/bluetooth/conn_time_sync/src/controller_time_nrf52.c

@@ -57,8 +57,8 @@ static int rtc_config(void)
 	const nrfx_rtc_config_t rtc_cfg = NRFX_RTC_DEFAULT_CONFIG;
 
 	ret = nrfx_rtc_init(&app_rtc_instance, &rtc_cfg, rtc_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing RTC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing RTC (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 
@@ -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");
@@ -267,7 +273,7 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	timer_val = MAX(timer_val, 1);
 	timer_val = MIN(timer_val, 30);
 
-	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != NRFX_SUCCESS) {
+	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != 0) {
 		printk("Failed setting trigger\n");
 	}
 

samples/bluetooth/conn_time_sync/src/controller_time_nrf53_app.c

@@ -48,8 +48,8 @@ static int rtc_config(void)
 	const nrfx_rtc_config_t rtc_cfg = NRFX_RTC_DEFAULT_CONFIG;
 
 	ret = nrfx_rtc_init(&app_rtc_instance, &rtc_cfg, rtc_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing RTC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing RTC (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 
@@ -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");
@@ -233,7 +239,7 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	timer_val = MAX(timer_val, 1);
 	timer_val = MIN(timer_val, 30);
 
-	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != NRFX_SUCCESS) {
+	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != 0) {
 		printk("Failed setting trigger\n");
 	}
 

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);

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

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

samples/bluetooth/iso_time_sync/src/controller_time_nrf52.c

@@ -57,8 +57,8 @@ static int rtc_config(void)
 	const nrfx_rtc_config_t rtc_cfg = NRFX_RTC_DEFAULT_CONFIG;
 
 	ret = nrfx_rtc_init(&app_rtc_instance, &rtc_cfg, rtc_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing RTC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing RTC (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 
@@ -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");
@@ -266,7 +272,7 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	timer_val = MAX(timer_val, 1);
 	timer_val = MIN(timer_val, 30);
 
-	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != NRFX_SUCCESS) {
+	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != 0) {
 		printk("Failed setting trigger\n");
 	}
 

samples/bluetooth/iso_time_sync/src/controller_time_nrf53_app.c

@@ -48,8 +48,8 @@ static int rtc_config(void)
 	const nrfx_rtc_config_t rtc_cfg = NRFX_RTC_DEFAULT_CONFIG;
 
 	ret = nrfx_rtc_init(&app_rtc_instance, &rtc_cfg, rtc_isr_handler);
-	if (ret != NRFX_SUCCESS) {
-		printk("Failed initializing RTC (ret: %d)\n", ret - NRFX_ERROR_BASE_NUM);
+	if (ret != 0) {
+		printk("Failed initializing RTC (ret: %d)\n", ret);
 		return -ENODEV;
 	}
 
@@ -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");
@@ -234,7 +240,7 @@ void controller_time_trigger_set(uint64_t timestamp_us)
 	timer_val = MAX(timer_val, 1);
 	timer_val = MIN(timer_val, 30);
 
-	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != NRFX_SUCCESS) {
+	if (nrfx_rtc_cc_set(&app_rtc_instance, 0, rtc_val, false) != 0) {
 		printk("Failed setting trigger\n");
 	}
 

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);

samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c

@@ -703,7 +703,6 @@ void nrf_auraconfig_main(void)
 	LOG_DBG("Main started");
 
 	ret = nrfx_clock_divider_set(NRF_CLOCK_DOMAIN_HFCLK, NRF_CLOCK_HFCLK_DIV_1);
-	ret -= NRFX_ERROR_BASE_NUM;
 	ERR_CHK_MSG(ret, "Failed to set HFCLK divider");
 
 	ret = led_init();

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;
 

scripts/quarantine.yaml

@@ -216,10 +216,10 @@
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8605"
 
 - scenarios:
-    - sample.mcumgr.smp_svr.bt.*
-    - sample.mcumgr.smp_svr.serial.*
+    - sample.mcumgr.smp_svr.*
     - sample.dfu.dfu_target
   platforms:
     - [email protected]/nrf54h20/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
+    - thingy53/nrf5340/cpuapp
   comment: "Requires rebase on collab-nrfx-4.0 branch"