From ce0da97aa1f844a540a9320da621c6d8a95f5b50 Mon Sep 17 00:00:00 2001 From: Rafal Dyla Date: Mon, 27 Jan 2025 09:25:57 +0100 Subject: [PATCH 1/8] [nrf fromtree] modules: hal_nordic: Adding SWEXT service Adding support for SWEXT (SWitch EXTernal) peripheral. Signed-off-by: Rafal Dyla (cherry picked from commit 2e44835b2185987bd5815f8cd49e45077b3644ea) --- modules/hal_nordic/nrfs/CMakeLists.txt | 3 ++- modules/hal_nordic/nrfs/Kconfig | 8 ++++++++ modules/hal_nordic/nrfs/nrfs_config.h | 4 ++++ soc/nordic/nrf54h/Kconfig | 2 ++ west.yml | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt index 41dfb61f864..cf738fe5bf2 100644 --- a/modules/hal_nordic/nrfs/CMakeLists.txt +++ b/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) diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig index cf40a64f592..0684ec222be 100644 --- a/modules/hal_nordic/nrfs/Kconfig +++ b/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" diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h index 392c2019dfe..da3cc1ada1b 100644 --- a/modules/hal_nordic/nrfs/nrfs_config.h +++ b/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 diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index 10428b77ec7..fa4ca5eb9bc 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/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 diff --git a/west.yml b/west.yml index f1659924fb0..cc556352398 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: groups: - hal - name: hal_nordic - revision: a1db06a2f6a1d069994d595cef563f58e44c4344 + revision: 1e1048562ff98563d492c8dcab1ee85775547abc path: modules/hal/nordic groups: - hal From f9f7b1661021c54299a1a7912432a3956f0e41ed Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 20 Feb 2025 13:29:26 +0100 Subject: [PATCH 2/8] [nrf fromtree] modules: hal_nordic: update version to include USBREG fix Update version to include USBREG HAL driver fix. Signed-off-by: Johann Fischer (cherry picked from commit f00d42f1de3e91490112be2ed3a401cae42ae897) --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index cc556352398..9fb25771d7c 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: groups: - hal - name: hal_nordic - revision: 1e1048562ff98563d492c8dcab1ee85775547abc + revision: 37ca068d7b013fb65a2acc9306bffa48a3e72839 path: modules/hal/nordic groups: - hal From 91f95b4f7395dfb5cd1ebd631f41d6a664abd544 Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 20 Feb 2025 13:38:16 +0100 Subject: [PATCH 3/8] [nrf fromtree] drivers: usb: do not enabled nRF USBREG interrupt The drivers still use the USBREG HAL driver which enables/disables the interrupt by itself. Signed-off-by: Johann Fischer (cherry picked from commit a05fd621193e2d1917306163ba8bec82ce9f17d8) --- drivers/usb/device/usb_dc_nrfx.c | 1 - drivers/usb/udc/udc_nrf.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c index c8442cb8f64..d7e56167120 100644 --- a/drivers/usb/device/usb_dc_nrfx.c +++ b/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 = { diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c index e7229174463..255895f23d8 100644 --- a/drivers/usb/udc/udc_nrf.c +++ b/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; } From fd202e68e36e9e02c33a499077c0cd07066e49c6 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Mon, 24 Feb 2025 14:03:31 +0100 Subject: [PATCH 4/8] [nrf fromlist] manifest: update hal_nordic revision to integrate nrfx 3.11.0 New nrfx version integrates MDK 8.70.0. Upstream PR #: 86238 Signed-off-by: Nikodem Kastelik --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 9fb25771d7c..eae96a3ad74 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: groups: - hal - name: hal_nordic - revision: 37ca068d7b013fb65a2acc9306bffa48a3e72839 + revision: pull/280/head path: modules/hal/nordic groups: - hal From 03196be604ad1078ec0f819ebbd887fe70697378 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Mon, 24 Feb 2025 14:09:10 +0100 Subject: [PATCH 5/8] [nrf fromlist] modules: hal_nordic: nrfx: align nRF54L09/L20 symbols to new scheme MDK 8.70.0 introduced following changes in the device naming: - renamed nRF54L20 Eng A to nRF54LM20A Eng A - renamed nRF54L09 Eng A to nRF54LV10A Eng A Actual SoC renaming will happen in followup PR. Upstream PR #: 86238 Signed-off-by: Nikodem Kastelik --- modules/hal_nordic/nrfx/CMakeLists.txt | 8 ++++---- modules/hal_nordic/nrfx/nrfx_config.h | 20 ++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index 62262d31e87..8210323f767 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/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) diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h index 6a337cd2588..4a2d5af18b6 100644 --- a/modules/hal_nordic/nrfx/nrfx_config.h +++ b/modules/hal_nordic/nrfx/nrfx_config.h @@ -78,10 +78,6 @@ #include #elif defined(NRF54L05_XXAA) && defined(NRF_FLPR) #include -#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION) - #include -#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR) - #include #elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION) #include #elif defined(NRF54L10_XXAA) && defined(NRF_FLPR) @@ -90,14 +86,14 @@ #include #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR) #include -#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION) - #include -#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR) - #include -#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION) - #include -#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR) - #include +#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION) + #include +#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR) + #include +#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION) + #include +#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR) + #include #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA) #include #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION) From 5b18038414c9d494e5610ca386eb7f437572d892 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Tue, 25 Feb 2025 11:59:39 +0100 Subject: [PATCH 6/8] [nrf fromlist] drivers: clock_control: nrf: ifdef optional events Some of the CLOCK events are associated with features not available on every nRF device. Upstream PR #: 86238 Signed-off-by: Nikodem Kastelik --- drivers/clock_control/clock_control_nrf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c index 03955d3fb7d..d829a945be7 100644 --- a/drivers/clock_control/clock_control_nrf.c +++ b/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: From 3446f4697f97c547c2238888497d96b9590f0129 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Wed, 26 Feb 2025 09:18:52 +0100 Subject: [PATCH 7/8] [nrf fromlist] drivers: serial: nrf: set default frame size and endianess Setting frame size and endianess is now supported in UARTE HAL, so these settings must have default values configured to avoid compiler warnings about uninitialized fields. Upstream PR #: 86238 Signed-off-by: Nikodem Kastelik --- drivers/serial/uart_nrfx_uarte.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index b973ce9fd7a..6728ec8fbbf 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/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; From 8a98031c0392ae1bed410cbd1489907ea778a1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Mon, 18 Nov 2024 17:42:52 +0100 Subject: [PATCH 8/8] [nrf fromtree] drivers: serial: nrfx_uarte: Deprecate non-legacy shim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some time ago a new shim for nRF UARTE was added (uart_nrfx_uarte2.c) which used nrfx_uarte.c driver underneath. It was supposed to support nrf54x platforms. However, later on legacy driver (uart_nrfx_uarte.c) was extended to support nrf54x platforms and it takes less code size, has better performance and more features. Shim uart_nrfx_uarte2 will no longer be supported. As new shim is the default and there is a Kconfig to pick the legacy shim (CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=y) it cannot be deprecated in the normal way. Additional Kconfig option is created (DEPRECATED_UART_NRFX_UARTE_LEGACY_SHIM) which is enabled if CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n and it selects DEPRECATED. A warning was also added to the CMakeLists.txt. Patch removes use CONFIG_UART_NRFX_UARTE_LEGACY_SHIM in tests. Signed-off-by: Krzysztof Chruściński (cherry picked from commit 70118c06a59dff10ce877a9162b810b1862fbf7b) --- drivers/serial/CMakeLists.txt | 2 ++ drivers/serial/Kconfig.nrfx | 2 ++ soc/nordic/Kconfig | 5 +++++ tests/drivers/uart/uart_async_api/testcase.yaml | 14 -------------- .../boards/nrf5340dk_nrf5340_cpuapp.conf | 1 - tests/drivers/uart/uart_pm/testcase.yaml | 9 ++------- 6 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt index 161a7454ac9..dcae664944d 100644 --- a/drivers/serial/CMakeLists.txt +++ b/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() diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx index d6f561967cf..b46991c6cff 100644 --- a/drivers/serial/Kconfig.nrfx +++ b/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" diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig index f380eb64bb6..e1e8982e27d 100644 --- a/soc/nordic/Kconfig +++ b/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 diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml index e0f14c3a492..c6ff52a515f 100644 --- a/tests/drivers/uart/uart_async_api/testcase.yaml +++ b/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 diff --git a/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf deleted file mode 100644 index 064e78b6f74..00000000000 --- a/tests/drivers/uart/uart_elementary/boards/nrf5340dk_nrf5340_cpuapp.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml index ca61df4645a..46bf61d11be 100644 --- a/tests/drivers/uart/uart_pm/testcase.yaml +++ b/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,7 +53,6 @@ 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: @@ -62,7 +60,6 @@ tests: - 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,7 +71,6 @@ 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: @@ -82,7 +78,6 @@ tests: - 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