manifest: Update sdk-zephyr revision and align to new API

Updated the hal_nordic revision and adjusted the code base to use multi-instance DPPI API. Certain applications have to explicitly enable nrfx_dppi and nrfx_ppib support with Kconfigs. Signed-off-by: Rafał Kuźnia <[email protected]>
nrfconnect · Oct 22, 2024 · 70653fa · 70653fa
1 parent 9582753
commit 70653fa
Show file tree

Hide file tree

Showing 24 changed files with 175 additions and 51 deletions.
diff --git a/applications/nrf5340_audio/src/modules/audio_sync_timer.c b/applications/nrf5340_audio/src/modules/audio_sync_timer.c
@@ -51,6 +51,8 @@ static uint8_t dppi_channel_timer_sync_with_rtc;
 static uint8_t dppi_channel_rtc_start;
 static volatile uint32_t num_rtc_overflows;
 
+static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 static nrfx_timer_config_t cfg = {.frequency = NRFX_MHZ_TO_HZ(1UL),
 				  .mode = NRF_TIMER_MODE_TIMER,
 				  .bit_width = NRF_TIMER_BIT_WIDTH_32,
@@ -161,7 +163,7 @@ static int audio_sync_timer_init(void)
 	nrfx_rtc_overflow_enable(&audio_sync_lf_timer_instance, true);
 
 	/* Initialize capturing of I2S frame start event timestamps */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_i2s_frame_start);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_i2s_frame_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (I2S frame start): %d", ret);
 		return -ENOMEM;
@@ -177,14 +179,14 @@ static int audio_sync_timer_init(void)
 			      dppi_channel_i2s_frame_start);
 
 	nrf_i2s_publish_set(NRF_I2S0, NRF_I2S_EVENT_FRAMESTART, dppi_channel_i2s_frame_start);
-	ret = nrfx_dppi_channel_enable(dppi_channel_i2s_frame_start);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_i2s_frame_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (I2S frame start): %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize capturing of current timestamps */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_curr_time_capture);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_curr_time_capture);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (I2S frame start) - Return value: %d", ret);
 		return -ENOMEM;
@@ -200,14 +202,14 @@ static int audio_sync_timer_init(void)
 
 	nrf_egu_publish_set(NRF_EGU0, NRF_EGU_EVENT_TRIGGERED0, dppi_channel_curr_time_capture);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_curr_time_capture);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_curr_time_capture);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (I2S frame start) - Return value: %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize functionality for synchronization between APP and NET core */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_rtc_start);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_rtc_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (timer clear): %d", ret);
 		return -ENOMEM;
@@ -222,14 +224,14 @@ static int audio_sync_timer_init(void)
 				   NRF_IPC_CHANNEL_4);
 	nrf_ipc_publish_set(NRF_IPC, AUDIO_SYNC_TIMER_NET_APP_IPC_EVT, dppi_channel_rtc_start);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_rtc_start);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_rtc_start);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (timer clear): %d", ret);
 		return -EIO;
 	}
 
 	/* Initialize functionality for synchronization between RTC and TIMER */
-	ret = nrfx_dppi_channel_alloc(&dppi_channel_timer_sync_with_rtc);
+	ret = nrfx_dppi_channel_alloc(&dppi, &dppi_channel_timer_sync_with_rtc);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel alloc error (timer clear): %d", ret);
 		return -ENOMEM;
@@ -242,7 +244,7 @@ static int audio_sync_timer_init(void)
 
 	nrfx_rtc_tick_enable(&audio_sync_lf_timer_instance, false);
 
-	ret = nrfx_dppi_channel_enable(dppi_channel_timer_sync_with_rtc);
+	ret = nrfx_dppi_channel_enable(&dppi, dppi_channel_timer_sync_with_rtc);
 	if (ret - NRFX_ERROR_BASE_NUM) {
 		LOG_ERR("nrfx DPPI channel enable error (timer clear): %d", ret);
 		return -EIO;

diff --git a/samples/bluetooth/conn_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -4,5 +4,16 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -4,5 +4,16 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet.conf
@@ -9,6 +9,6 @@ CONFIG_IPC_SERVICE=y
 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y
 CONFIG_MBOX=y
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
 
 CONFIG_HEAP_MEM_POOL_SIZE=4096
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf b/samples/bluetooth/direct_test_mode/boards/nrf5340dk_nrf5340_cpunet_hci.conf
@@ -8,7 +8,7 @@ CONFIG_IPC_SERVICE=y
 CONFIG_IPC_SERVICE_BACKEND_RPMSG=y
 CONFIG_MBOX=y
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
 
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 

diff --git a/samples/bluetooth/direct_test_mode/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/direct_test_mode/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -12,4 +12,15 @@ CONFIG_NRFX_TIMER2=n
 # Use necessary peripherals
 CONFIG_NRFX_TIMER20=y
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
diff --git a/samples/bluetooth/direct_test_mode/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/direct_test_mode/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -12,4 +12,15 @@ CONFIG_NRFX_TIMER2=n
 # Use necessary peripherals
 CONFIG_NRFX_TIMER20=y
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -6,4 +6,4 @@
 
 CONFIG_NRFX_TIMER0=y
 CONFIG_NRFX_RTC0=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI0=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -4,5 +4,16 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -4,5 +4,16 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
 CONFIG_BT_RX_STACK_SIZE=2048
diff --git a/samples/peripheral/802154_phy_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/peripheral/802154_phy_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,7 +11,19 @@ CONFIG_PTT_CACHE_MGMT=n
 
 # nrfx drivers configuration:
 CONFIG_NRFX_TIMER20=y  # enable TIMER2
-CONFIG_NRFX_DPPI=y  # enable DPPIC
+# enable DPPIC
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
 
 # Set temperature sensor update period in ms
 CONFIG_NRF_802154_TEMPERATURE_UPDATE_PERIOD=10000
diff --git a/samples/peripheral/radio_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/peripheral/radio_test/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -9,4 +9,15 @@ CONFIG_NRFX_TIMER0=n
 
 # Enable the necessary drivers
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
diff --git a/samples/peripheral/radio_test/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/peripheral/radio_test/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -9,4 +9,15 @@ CONFIG_NRFX_TIMER0=n
 
 # Enable the necessary drivers
 CONFIG_NRFX_TIMER10=y
-CONFIG_NRFX_DPPI=y
+CONFIG_NRFX_DPPI00=y
+CONFIG_NRFX_DPPI10=y
+CONFIG_NRFX_DPPI20=y
+CONFIG_NRFX_DPPI30=y
+CONFIG_NRFX_PPIB00=y
+CONFIG_NRFX_PPIB01=y
+CONFIG_NRFX_PPIB10=y
+CONFIG_NRFX_PPIB11=y
+CONFIG_NRFX_PPIB20=y
+CONFIG_NRFX_PPIB21=y
+CONFIG_NRFX_PPIB22=y
+CONFIG_NRFX_PPIB30=y
diff --git a/subsys/debug/cpu_load/cpu_load.c b/subsys/debug/cpu_load/cpu_load.c
@@ -42,6 +42,9 @@ static uint32_t shared_ch_mask;
 	(IS_ENABLED(CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS) && \
 	(BIT(ch) & shared_ch_mask))
 
+#ifdef DPPI_PRESENT
+static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+#endif
 
 /** @brief Allocate (D)PPI channel. */
 static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
@@ -60,7 +63,7 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 		err = NRFX_SUCCESS;
 		shared_ch_mask |= BIT(*ch);
 	} else {
-		err = nrfx_dppi_channel_alloc(ch);
+		err = nrfx_dppi_channel_alloc(&dppi, ch);
 	}
 #else
 	err = nrfx_ppi_channel_alloc((nrf_ppi_channel_t *)ch);
@@ -73,7 +76,7 @@ static nrfx_err_t ppi_free(uint8_t ch)
 #ifdef DPPI_PRESENT
 	if (!IS_ENABLED(CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS)
 		|| ((BIT(ch) & shared_ch_mask) == 0)) {
-		return nrfx_dppi_channel_free(ch);
+		return nrfx_dppi_channel_free(&dppi, ch);
 	} else {
 		return NRFX_SUCCESS;
 	}

diff --git a/subsys/debug/ppi_trace/ppi_trace.c b/subsys/debug/ppi_trace/ppi_trace.c
@@ -51,6 +51,10 @@ LOG_MODULE_REGISTER(ppi_trace, CONFIG_PPI_TRACE_LOG_LEVEL);
 	[DT_PROP(gpio_node, port)] = \
 		NRFX_GPIOTE_INSTANCE(DT_PROP(GPIOTE_NODE(gpio_node), instance)),
 
+#ifdef DPPI_PRESENT
+static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+#endif
+
 static const nrfx_gpiote_t *get_gpiote(nrfx_gpiote_pin_t pin)
 {
 	static const nrfx_gpiote_t gpiote[GPIO_COUNT] = {
@@ -73,7 +77,7 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 		*ch = *PUBLISH_ADDR(evt) & DPPIC_SUBSCRIBE_CHG_EN_CHIDX_Msk;
 		err = NRFX_SUCCESS;
 	} else {
-		err = nrfx_dppi_channel_alloc(ch);
+		err = nrfx_dppi_channel_alloc(&dppi, ch);
 	}
 #else
 	err = nrfx_ppi_channel_alloc((nrf_ppi_channel_t *)ch);

diff --git a/subsys/dm/dm.c b/subsys/dm/dm.c
@@ -25,8 +25,11 @@
 
 #if defined(DPPI_PRESENT)
 #include <nrfx_dppi.h>
+
+static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 #define gppi_channel_t uint8_t
-#define gppi_channel_alloc nrfx_dppi_channel_alloc
+#define gppi_channel_alloc(x) nrfx_dppi_channel_alloc(&dppi, x)
 #else
 #include <nrfx_ppi.h>
 #define gppi_channel_t nrf_ppi_channel_t