[nrf fromlist] Integrate nrfx 3.11.0

drivers/clock_control/clock_control_nrf.c

@@ -629,6 +629,7 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 		}
 		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_LFCLK);
 		break;
+#if NRF_CLOCK_HAS_CALIBRATION
 	case NRFX_CLOCK_EVT_CAL_DONE:
 		if (IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_DRIVER_CALIBRATION)) {
 			z_nrf_clock_calibration_done_handler();
@@ -637,7 +638,10 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 			__ASSERT_NO_MSG(false);
 		}
 		break;
+#endif
+#if NRF_CLOCK_HAS_PLL
 	case NRFX_CLOCK_EVT_PLL_STARTED:
+#endif
 #if NRF_CLOCK_HAS_XO_TUNE
 	case NRFX_CLOCK_EVT_XO_TUNED:
 	case NRFX_CLOCK_EVT_XO_TUNE_ERROR:

drivers/serial/CMakeLists.txt

@@ -91,6 +91,8 @@ if (CONFIG_UART_NRFX_UARTE)
   if (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM)
     zephyr_library_sources(uart_nrfx_uarte.c)
   else()
+    message(DEPRECATION
+	    "Do not set CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n as this option is deprecated.")
     zephyr_library_sources(uart_nrfx_uarte2.c)
   endif()
 endif()

drivers/serial/Kconfig.nrfx

@@ -32,6 +32,8 @@ config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
 	default y
+	help
+	  Disabling this option is deprecated.
 
 config UART_NRFX_UARTE_ENHANCED_RX
 	bool "Enhanced RX handling"

drivers/serial/uart_nrfx_uarte.c

@@ -605,6 +605,12 @@ static int uarte_nrfx_configure(const struct device *dev,
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN;
 #endif
+
+#if NRF_UARTE_HAS_FRAME_SIZE
+	uarte_cfg.frame_size = NRF_UARTE_FRAME_SIZE_8_BIT;
+	uarte_cfg.endian = NRF_UARTE_ENDIAN_MSB;
+#endif
+
 	nrf_uarte_configure(get_uarte_instance(dev), &uarte_cfg);
 
 	data->uart_config = *cfg;

drivers/usb/device/usb_dc_nrfx.c

@@ -1892,7 +1892,6 @@ static int usb_init(void)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	static const nrfx_power_config_t power_config = {

drivers/usb/udc/udc_nrf.c

@@ -817,7 +817,6 @@ static int udc_nrf_init(const struct device *dev)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
@@ -838,9 +837,6 @@ static int udc_nrf_shutdown(const struct device *dev)
 
 	nrfx_power_usbevt_disable();
 	nrfx_power_usbevt_uninit();
-#ifdef CONFIG_HAS_HW_NRF_USBREG
-	irq_disable(USBREGULATOR_IRQn);
-#endif
 
 	return 0;
 }

modules/hal_nordic/nrfs/CMakeLists.txt

@@ -25,13 +25,14 @@ if(CONFIG_NRFS)
         zephyr_library_sources_ifdef(CONFIG_NRFS_CLOCK_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_clock.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DIAG_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_diag.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DVFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_dvfs.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_GDPWR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdpwr.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_MRAM_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_mram.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_PMIC_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_pmic.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_SWEXT_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_swext.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_TEMP_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_temp.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_VBUS_DETECTOR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_usb.c)
-        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources(${SRC_DIR}/internal/nrfs_dispatcher.c)
         add_subdirectory_ifdef(CONFIG_NRFS_DVFS_LOCAL_DOMAIN dvfs)
 

modules/hal_nordic/nrfs/Kconfig

@@ -34,6 +34,9 @@ config NRFS_HAS_PMIC_SERVICE
 config NRFS_HAS_RESET_SERVICE
 	bool
 
+config NRFS_HAS_SWEXT_SERVICE
+	bool
+
 config NRFS_HAS_TEMP_SERVICE
 	bool
 
@@ -125,6 +128,11 @@ config NRFS_GDFS_SERVICE_ENABLED
 	depends on NRFS_HAS_GDFS_SERVICE
 	default y
 
+config NRFS_SWEXT_SERVICE_ENABLED
+	bool "SWEXT peripheral control service"
+	depends on NRFS_HAS_SWEXT_SERVICE
+	default y
+
 endmenu
 
 rsource "backends/Kconfig"

modules/hal_nordic/nrfs/nrfs_config.h

@@ -52,6 +52,10 @@
 #define NRFS_GDFS_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_SWEXT_SERVICE_ENABLED
+#define NRFS_SWEXT_SERVICE_ENABLED
+#endif
+
 #ifdef CONFIG_SOC_POSIX
 #define NRFS_UNIT_TESTS_ENABLED
 #endif

modules/hal_nordic/nrfx/CMakeLists.txt

@@ -48,7 +48,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54L09_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54LV10A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
@@ -59,7 +59,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54L20_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54LM20A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
@@ -235,12 +235,12 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54lv10a_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)

modules/hal_nordic/nrfx/nrfx_config.h

@@ -78,10 +78,6 @@
     #include <templates/nrfx_config_nrf54l05_application.h>
 #elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l05_flpr.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l09_enga_application.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l09_enga_flpr.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
     #include <templates/nrfx_config_nrf54l10_application.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
@@ -90,14 +86,14 @@
     #include <templates/nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l15_flpr.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l15_enga_application.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l15_enga_flpr.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l20_enga_application.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l20_enga_flpr.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lm20a_enga_application.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lm20a_enga_flpr.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lv10a_enga_application.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lv10a_enga_flpr.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
     #include <templates/nrfx_config_nrf91.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)

soc/nordic/Kconfig

@@ -197,4 +197,9 @@ config NRF_PLATFORM_HALTIUM
 	  this option. This allows to easily enable common functionality on
 	  SoCs based on the Haltium platform.
 
+config DEPRECATED_UART_NRFX_UARTE_LEGACY_SHIM
+	bool
+	default y if !UART_NRFX_UARTE_LEGACY_SHIM
+	select DEPRECATED
+
 endif # SOC_FAMILY_NORDIC_NRF

soc/nordic/nrf54h/Kconfig

@@ -28,6 +28,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_PM
@@ -52,6 +53,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM

tests/drivers/uart/uart_async_api/testcase.yaml

@@ -25,20 +25,6 @@ tests:
     platform_allow: nucleo_h743zi
     integration_platforms:
       - nucleo_h743zi
-  drivers.uart.async_api.nrf_uarte_new:
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf52_bsim
-      - nrf5340bsim/nrf5340/cpuapp
-      - nrf54l20pdk/nrf54l20/cpuapp
-      - nrf54l15bsim/nrf54l15/cpuapp
-    filter: CONFIG_SERIAL_SUPPORT_ASYNC
-    harness: ztest
-    harness_config:
-      fixture: gpio_loopback
-    depends_on: gpio
-    extra_configs:
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n
   drivers.uart.async_api.nrf_uart:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest

tests/drivers/uart/uart_pm/testcase.yaml

@@ -22,27 +22,26 @@ tests:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.no_rxpin:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54l15bsim/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - nrf52_bsim
+      - nrf5340bsim/nrf5340/cpuapp
 
   drivers.uart.pm.enhanced_poll:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
@@ -54,15 +53,13 @@ tests:
       - CONFIG_UART_0_INTERRUPT_DRIVEN=y
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.int_driven.enhanced_poll:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=y
       - CONFIG_UART_0_INTERRUPT_DRIVEN=y
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
@@ -74,15 +71,13 @@ tests:
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
 
   drivers.uart.pm.async.enhanced_poll:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
-      - CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y
     platform_exclude:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp

west.yml

@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: a1db06a2f6a1d069994d595cef563f58e44c4344
+      revision: pull/280/head
       path: modules/hal/nordic
       groups:
         - hal