From 3c8935556588eba952ba7630dea6f9614918a0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Mon, 20 Oct 2025 14:06:28 +0200 Subject: [PATCH 1/2] [nrf fromlist] modules: hal_nordic: remove UARTE symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed Kconfig symbols for each UARTE instance which are no longer needed. Upstream PR #: 97923 Signed-off-by: Michał Stasiak --- modules/hal_nordic/nrfx/Kconfig | 102 +------------------------ modules/hal_nordic/nrfx/nrfx_kconfig.h | 60 --------------- 2 files changed, 1 insertion(+), 161 deletions(-) diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig index 4f729c95f17..46be2479d34 100644 --- a/modules/hal_nordic/nrfx/Kconfig +++ b/modules/hal_nordic/nrfx/Kconfig @@ -829,107 +829,7 @@ config NRFX_UART0 select NRFX_UART config NRFX_UARTE - bool - -config NRFX_UARTE0 - bool "UARTE0 driver instance" - depends on $(dt_nodelabel_exists,uart0) - select NRFX_UARTE - -config NRFX_UARTE1 - bool "UARTE1 driver instance" - depends on $(dt_nodelabel_exists,uart1) - select NRFX_UARTE - -config NRFX_UARTE2 - bool "UARTE2 driver instance" - depends on $(dt_nodelabel_exists,uart2) - select NRFX_UARTE - -config NRFX_UARTE3 - bool "UARTE3 driver instance" - depends on $(dt_nodelabel_exists,uart3) - select NRFX_UARTE - -config NRFX_UARTE00 - bool "UARTE00 driver instance" - depends on $(dt_nodelabel_exists,uart00) - select NRFX_UARTE - -config NRFX_UARTE20 - bool "UARTE20 driver instance" - depends on $(dt_nodelabel_exists,uart20) - select NRFX_UARTE - -config NRFX_UARTE21 - bool "UARTE21 driver instance" - depends on $(dt_nodelabel_exists,uart21) - select NRFX_UARTE - -config NRFX_UARTE22 - bool "UARTE22 driver instance" - depends on $(dt_nodelabel_exists,uart22) - select NRFX_UARTE - -config NRFX_UARTE23 - bool "UARTE23 driver instance" - depends on $(dt_nodelabel_exists,uart23) - select NRFX_UARTE - -config NRFX_UARTE24 - bool "UARTE24 driver instance" - depends on $(dt_nodelabel_exists,uart24) - select NRFX_UARTE - -config NRFX_UARTE30 - bool "UARTE30 driver instance" - depends on $(dt_nodelabel_exists,uart30) - select NRFX_UARTE - -config NRFX_UARTE120 - bool "UARTE120 driver instance" - depends on $(dt_nodelabel_exists,uart120) - select NRFX_UARTE - -config NRFX_UARTE130 - bool "UARTE130 driver instance" - depends on $(dt_nodelabel_exists,uart130) - select NRFX_UARTE - -config NRFX_UARTE131 - bool "UARTE131 driver instance" - depends on $(dt_nodelabel_exists,uart131) - select NRFX_UARTE - -config NRFX_UARTE132 - bool "UARTE132 driver instance" - depends on $(dt_nodelabel_exists,uart132) - select NRFX_UARTE - -config NRFX_UARTE133 - bool "UARTE133 driver instance" - depends on $(dt_nodelabel_exists,uart133) - select NRFX_UARTE - -config NRFX_UARTE134 - bool "UARTE134 driver instance" - depends on $(dt_nodelabel_exists,uart134) - select NRFX_UARTE - -config NRFX_UARTE135 - bool "UARTE135 driver instance" - depends on $(dt_nodelabel_exists,uart135) - select NRFX_UARTE - -config NRFX_UARTE136 - bool "UARTE136 driver instance" - depends on $(dt_nodelabel_exists,uart136) - select NRFX_UARTE - -config NRFX_UARTE137 - bool "UARTE137 driver instance" - depends on $(dt_nodelabel_exists,uart137) - select NRFX_UARTE + bool "UARTE driver" config NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG bool "UARTE GPIO configuration support" diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h index af9bd635385..85e74060d45 100644 --- a/modules/hal_nordic/nrfx/nrfx_kconfig.h +++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h @@ -735,66 +735,6 @@ #ifdef CONFIG_NRFX_UARTE_LOG #define NRFX_UARTE_CONFIG_LOG_ENABLED 1 #endif -#ifdef CONFIG_NRFX_UARTE0 -#define NRFX_UARTE0_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE1 -#define NRFX_UARTE1_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE2 -#define NRFX_UARTE2_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE3 -#define NRFX_UARTE3_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE00 -#define NRFX_UARTE00_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE20 -#define NRFX_UARTE20_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE21 -#define NRFX_UARTE21_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE22 -#define NRFX_UARTE22_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE23 -#define NRFX_UARTE23_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE24 -#define NRFX_UARTE24_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE30 -#define NRFX_UARTE30_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE120 -#define NRFX_UARTE120_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE130 -#define NRFX_UARTE130_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE131 -#define NRFX_UARTE131_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE132 -#define NRFX_UARTE132_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE133 -#define NRFX_UARTE133_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE134 -#define NRFX_UARTE134_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE135 -#define NRFX_UARTE135_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE136 -#define NRFX_UARTE136_ENABLED 1 -#endif -#ifdef CONFIG_NRFX_UARTE137 -#define NRFX_UARTE137_ENABLED 1 -#endif #ifdef CONFIG_NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG #define NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG 1 #endif From 2a10faee2ec6a9103cc1b7da86cd7409dbf56f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Mon, 20 Oct 2025 14:10:25 +0200 Subject: [PATCH 2/2] [nrf fromlist] samples: nordic: nrfx_prs: align to nrfx_uarte rework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed error codes, driver instantiation and removed unnecessary symbols. Upstream PR #: 97923 Signed-off-by: Michał Stasiak --- samples/boards/nordic/nrfx_prs/prj.conf | 2 +- samples/boards/nordic/nrfx_prs/src/main.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/samples/boards/nordic/nrfx_prs/prj.conf b/samples/boards/nordic/nrfx_prs/prj.conf index 87fbfd9e781..47dd7198fd9 100644 --- a/samples/boards/nordic/nrfx_prs/prj.conf +++ b/samples/boards/nordic/nrfx_prs/prj.conf @@ -2,7 +2,7 @@ # between those peripherals, as they share the same ID and hence cannot be used # simultaneously. CONFIG_NRFX_SPIM=y -CONFIG_NRFX_UARTE2=y +CONFIG_NRFX_UARTE=y CONFIG_NRFX_PRS_BOX_2=y # This is needed for using another SPIM instance via the Zephyr SPI driver. diff --git a/samples/boards/nordic/nrfx_prs/src/main.c b/samples/boards/nordic/nrfx_prs/src/main.c index 804aee378b3..d767a2bf10c 100644 --- a/samples/boards/nordic/nrfx_prs/src/main.c +++ b/samples/boards/nordic/nrfx_prs/src/main.c @@ -29,7 +29,7 @@ #define SPI_DEV_NODE DT_NODELABEL(spi1) static nrfx_spim_t spim = NRFX_SPIM_INSTANCE(NRF_SPIM2); -static nrfx_uarte_t uarte = NRFX_UARTE_INSTANCE(2); +static nrfx_uarte_t uarte = NRFX_UARTE_INSTANCE(NRF_UARTE2); static bool spim_initialized; static bool uarte_initialized; static volatile size_t received; @@ -212,7 +212,6 @@ static void uarte_handler(const nrfx_uarte_event_t *p_event, void *p_context) static bool switch_to_uarte(void) { int ret; - nrfx_err_t err; PINCTRL_DT_DEFINE(UARTE_NODE); @@ -243,9 +242,9 @@ static bool switch_to_uarte(void) return ret; } - err = nrfx_uarte_init(&uarte, &uarte_config, uarte_handler); - if (err != NRFX_SUCCESS) { - printk("nrfx_uarte_init() failed: 0x%08x\n", err); + ret = nrfx_uarte_init(&uarte, &uarte_config, uarte_handler); + if (err != 0) { + printk("nrfx_uarte_init() failed: %d\n", ret); return false; } @@ -257,23 +256,23 @@ static bool switch_to_uarte(void) static bool uarte_transfer(const uint8_t *tx_data, size_t tx_data_len, uint8_t *rx_buf, size_t rx_buf_size) { - nrfx_err_t err; + int err; err = nrfx_uarte_rx_buffer_set(&uarte, rx_buf, rx_buf_size); - if (err != NRFX_SUCCESS) { - printk("nrfx_uarte_rx_buffer_set() failed: 0x%08x\n", err); + if (err != 0) { + printk("nrfx_uarte_rx_buffer_set() failed: %d\n", err); return false; } err = nrfx_uarte_rx_enable(&uarte, NRFX_UARTE_RX_ENABLE_STOP_ON_END); - if (err != NRFX_SUCCESS) { - printk("nrfx_uarte_rx_enable() failed: 0x%08x\n", err); + if (err != 0) { + printk("nrfx_uarte_rx_enable() failed: %d\n", err); return false; } err = nrfx_uarte_tx(&uarte, tx_data, tx_data_len, 0); - if (err != NRFX_SUCCESS) { - printk("nrfx_uarte_tx() failed: 0x%08x\n", err); + if (err != 0) { + printk("nrfx_uarte_tx() failed: %d\n", err); return false; }