merge collab-nrfx-4.0 to main branch

boards/native/nrf_bsim/Kconfig

@@ -5,7 +5,6 @@ config BOARD_NRF52_BSIM
 	bool
 	select SOC_SERIES_BSIM_NRF52X
 	select SOC_COMPATIBLE_NRF52833
-	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
 	help
 	  NRF52 simulation model
@@ -16,7 +15,6 @@ config BOARD_NRF5340BSIM_NRF5340_CPUNET
 	bool
 	select SOC_SERIES_BSIM_NRF53X
 	select SOC_COMPATIBLE_NRF5340_CPUNET
-	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
 	help
 	  Simulated NRF53 Network core
@@ -27,7 +25,6 @@ config BOARD_NRF5340BSIM_NRF5340_CPUAPP
 	bool
 	select SOC_SERIES_BSIM_NRF53X
 	select SOC_COMPATIBLE_NRF5340_CPUAPP
-	select NRF_RTC_TIMER
 	select CLOCK_CONTROL
 	help
 	  Simulated NRF53 Application core
@@ -66,6 +63,10 @@ source "soc/nordic/common/Kconfig.peripherals"
 
 source "boards/native/common/extra_args/Kconfig"
 
+config SOC_NORDIC_BSP_NAME
+	string
+	default "stable"
+
 endif # SOC_SERIES_BSIM_NRFXX
 
 

boards/native/nrf_bsim/common/cmsis/cmsis.h

@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include "cmsis_instr.h"
 #if defined(CONFIG_SOC_COMPATIBLE_NRF52833)
-#include "nrf52833.h"
+#include "mdk/nrf52833.h"
 #endif
 
 #ifdef __cplusplus

boards/native/nrf_bsim/soc/soc_secure.h

@@ -12,7 +12,7 @@
 
 
 #include <stdint.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_ficr.h>
 
 static inline void soc_secure_read_deviceid(uint32_t deviceid[2])

drivers/adc/Kconfig.ad405x

@@ -13,6 +13,6 @@ config ADC_AD405X
 
 config AD405X_TRIGGER
 	bool "AD405X interrupts"
-	default n
+	depends on ADC_AD405X
 	help
 	  Enable interrupts for ADI AD405X.

drivers/adc/adc_nrfx_adc.c

@@ -265,12 +265,12 @@ static int init_adc(const struct device *dev)
 {
 	const nrfx_adc_config_t config = NRFX_ADC_DEFAULT_CONFIG;
 
-	nrfx_err_t result = nrfx_adc_init(&config, event_handler);
+	int result = nrfx_adc_init(&config, event_handler);
 
-	if (result != NRFX_SUCCESS) {
+	if (result != 0) {
 		LOG_ERR("Failed to initialize device: %s",
 			    dev->name);
-		return -EBUSY;
+		return result;
 	}
 
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),