manifest: update hal_nordic revision to have nrfx 3.7.0 release

New nrfx 3.7.0 release contains nRF54H20 EngC support and multi-instanced PDM driver needed for nRF54L15 support. Therefore support for PDM0 instance had to be added in devicetree and Kconfig symbols. Additionally, NRF_CCM_EVENT_ENDCRYPT was unified and renamed to NRF_CCM_EVENT_END, so radio controller and BabbleSim had to be aligned accordingly. Signed-off-by: Nikodem Kastelik <[email protected]>
zephyrproject-rtos · Sep 30, 2024 · e5b8594 · e5b8594
1 parent f810e13
commit e5b8594
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 26 deletions.
diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -5,7 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
 	bool "nRF PDM nrfx driver"
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
-	select NRFX_PDM
+	select NRFX_PDM0 if HAS_HW_NRF_PDM0
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -84,20 +84,20 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF91X
 zephyr_compile_definitions_ifdef(CONFIG_ARM_NONSECURE_FIRMWARE NRF_TRUSTZONE_NONSECURE)
 zephyr_compile_definitions_ifdef(CONFIG_LOG_BACKEND_SWO ENABLE_SWO)
 
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF51X  ${MDK_DIR}/system_nrf51.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52805       ${MDK_DIR}/system_nrf52805.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52810       ${MDK_DIR}/system_nrf52810.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52811       ${MDK_DIR}/system_nrf52811.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52820       ${MDK_DIR}/system_nrf52820.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52832       ${MDK_DIR}/system_nrf52.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52833       ${MDK_DIR}/system_nrf52833.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF52840       ${MDK_DIR}/system_nrf52840.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP ${MDK_DIR}/system_nrf5340_application.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUNET ${MDK_DIR}/system_nrf5340_network.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54HX ${MDK_DIR}/system_nrf54h.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54LX ${MDK_DIR}/system_nrf54l.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF91X  ${MDK_DIR}/system_nrf91.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF51X      ${MDK_DIR}/system_nrf51.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52805           ${MDK_DIR}/system_nrf52805.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52810           ${MDK_DIR}/system_nrf52810.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52811           ${MDK_DIR}/system_nrf52811.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52820           ${MDK_DIR}/system_nrf52820.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52832           ${MDK_DIR}/system_nrf52.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52833           ${MDK_DIR}/system_nrf52833.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF52840           ${MDK_DIR}/system_nrf52840.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP     ${MDK_DIR}/system_nrf5340_application.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUNET     ${MDK_DIR}/system_nrf5340_network.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54HX     ${MDK_DIR}/system_nrf54h.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LX ${MDK_DIR}/system_nrf54l.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF91X      ${MDK_DIR}/system_nrf91.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X      ${MDK_DIR}/system_nrf92.c)
 
 zephyr_library_sources(nrfx_glue.c)
 zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
@@ -162,8 +162,12 @@ config NRFX_NVMC
 		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
 
 config NRFX_PDM
-	bool "PDM driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PDM))
+	bool
+
+config NRFX_PDM0
+	bool "PDM0 driver instance"
+	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+	select NRFX_PDM
 
 config NRFX_POWER
 	bool "POWER driver"

diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -215,6 +215,9 @@
 #ifdef CONFIG_NRFX_PDM_LOG
 #define NRFX_PDM_CONFIG_LOG_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_PDM0
+#define NRFX_PDM0_ENABLED 1
+#endif
 
 #ifdef CONFIG_NRFX_POWER
 #define NRFX_POWER_ENABLED 1

diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
@@ -126,8 +126,8 @@ config HAS_HW_NRF_NVMC_PE
 config HAS_HW_NRF_OSCILLATORS
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS))
 
-config HAS_HW_NRF_PDM
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PDM))
+config HAS_HW_NRF_PDM0
+	def_bool $(dt_nodelabel_enabled_with_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
 
 config HAS_HW_NRF_POWER
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER))

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -2052,7 +2052,7 @@ static void *radio_ccm_ext_rx_pkt_set(struct ccm *cnf, uint8_t phy, uint8_t pdu_
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = 0;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);
@@ -2127,7 +2127,7 @@ static void *radio_ccm_ext_tx_pkt_set(struct ccm *cnf, uint8_t pdu_type, void *p
 	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDKSGEN);
-	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ENDCRYPT);
+	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_END);
 	nrf_ccm_event_clear(NRF_CCM, NRF_CCM_EVENT_ERROR);
 
 	nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_KSGEN);

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -633,8 +633,8 @@ static inline uint32_t hal_radio_tx_power_value(int8_t tx_power_lvl)
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
-	if (tx_power_lvl >= -26) {
-		return RADIO_TXPOWER_TXPOWER_Neg26dBm;
+	if (tx_power_lvl >= -28) {
+		return RADIO_TXPOWER_TXPOWER_Neg28dBm;
 	}
 
 	if (tx_power_lvl >= -40) {

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -149,15 +149,15 @@ static inline void hal_trigger_crypt_ppi_config(void)
 {
 	nrf_radio_publish_set(NRF_RADIO,
 			      NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+	nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
 }
 
 /*******************************************************************************
  * Disable trigger encryption task
  */
 static inline void hal_trigger_crypt_ppi_disable(void)
 {
-	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_CRYPT);
+	nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
 }
 
 /*******************************************************************************

diff --git a/west.yml b/west.yml
@@ -188,7 +188,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 6d4acb8dbd9e92c7c5d6e18724197e3f007ae45e
+      revision: pull/223/head
       path: modules/hal/nordic
       groups:
         - hal