Skip to content

Commit 29b869d

Browse files
nordic-krchnordic-krch
committed
Revert "drivers: serial: nrfx_uarte: Deprecate CONFIG_UART_x_NRF_HW_ASYNC"
This reverts commit 384e940. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
1 parent 92d8d08 commit 29b869d

File tree

10 files changed

+25
-7
lines changed

10 files changed

+25
-7
lines changed

‎drivers/serial/Kconfig.nrfx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ config UART_NRFX_UARTE_ENHANCED_RX
6060
bool "Enhanced RX handling"
6161
depends on UART_ASYNC_API
6262
depends on UART_NRFX_UARTE_LEGACY_SHIM
63-
default y
63+
default y if !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
6464
help
6565
Enable RX handling mode which is switching buffers on timeout. This is an
6666
enhancement compared to other two modes (default and hardware assisted).

‎drivers/serial/Kconfig.nrfx_uart_instance

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,18 @@ config UART_$(nrfx_uart_num)_NRF_TX_BUFFER_SIZE
4949
particular SoC.
5050

5151
config UART_$(nrfx_uart_num)_NRF_HW_ASYNC
52-
bool "[DEPRECATED] Use hardware RX byte counting"
52+
bool "Use hardware RX byte counting"
5353
depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
5454
depends on UART_ASYNC_API
5555
depends on UART_NRFX_UARTE_LEGACY_SHIM
56-
depends on !UART_NRFX_UARTE_ENHANCED_RX
5756
depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
5857
select NRFX_GPPI
59-
select DEPRECATED
6058
help
6159
If default driver uses interrupts to count incoming bytes, it is possible
6260
that with higher speeds and/or high cpu load some data can be lost.
6361
It is recommended to use hardware byte counting in such scenarios.
6462
Hardware RX byte counting requires timer instance and one PPI channel.
6563

66-
This options is deprecated. Use UART_NRFX_UARTE_ENHANCED_RX which supports
67-
reliable byte counting without additional HW resources (TIMER and (D)PPI).
68-
6964
config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
7065
bool "Low power mode"
7166
depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)

‎samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
CONFIG_UART_ASYNC_API=y
22
CONFIG_UART_1_ASYNC=y
33
CONFIG_UART_1_INTERRUPT_DRIVEN=n
4+
# Enable HW RX byte counting. This especially matters at higher baud rates.
5+
CONFIG_UART_1_NRF_HW_ASYNC=y
6+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
47

58
# Align with the Serial LTE Modem (SLM) application.
69
CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000

‎samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
CONFIG_UART_ASYNC_API=y
22
CONFIG_UART_1_ASYNC=y
33
CONFIG_UART_1_INTERRUPT_DRIVEN=n
4+
# Enable HW RX byte counting. This especially matters at higher baud rates.
5+
CONFIG_UART_1_NRF_HW_ASYNC=y
6+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
47

58
# Align with the Serial LTE Modem (SLM) application.
69
CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000

‎tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
2+
CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y

‎tests/drivers/uart/uart_async_api/boards/nrf5340dk_nrf5340_cpuapp.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
CONFIG_UART_1_NRF_HW_ASYNC=y
2+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
13
CONFIG_VAR_LENGTH_BUFFER_TEST_BUADRATE_LIMIT=57600

‎tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
CONFIG_ARM_MPU=n
22
CONFIG_VAR_LENGTH_BUFFER_TEST_BUADRATE_LIMIT=57600
3+
CONFIG_UART_1_NRF_HW_ASYNC=y
4+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2

‎tests/drivers/uart/uart_errors/boards/nrf5340dk_nrf5340_cpuapp.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_UART_1_NRF_HW_ASYNC=y
2+
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1

‎tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ tests:
7777
- CONFIG_UART_0_INTERRUPT_DRIVEN=n
7878
- CONFIG_UART_0_ASYNC=y
7979
- CONFIG_UART_0_ENHANCED_POLL_OUT=y
80+
- CONFIG_UART_0_NRF_HW_ASYNC=y
81+
- CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
82+
- CONFIG_NRFX_TIMER2=y
8083
platform_allow:
8184
- nrf52840dk/nrf52840
8285
- nrf5340dk/nrf5340/cpuapp

‎tests/drivers/uart/uart_pm/testcase.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,19 @@ tests:
7878
- CONFIG_UART_INTERRUPT_DRIVEN=n
7979
- CONFIG_UART_ASYNC_API=y
8080
- CONFIG_UART_0_ASYNC=y
81+
- CONFIG_UART_0_NRF_HW_ASYNC=y
82+
- CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
83+
- CONFIG_NRFX_TIMER2=y
8184
- CONFIG_UART_0_ENHANCED_POLL_OUT=n
8285

8386
drivers.uart.pm.async.enhanced_poll:
8487
extra_configs:
8588
- CONFIG_UART_INTERRUPT_DRIVEN=n
8689
- CONFIG_UART_ASYNC_API=y
8790
- CONFIG_UART_0_ASYNC=y
91+
- CONFIG_UART_0_NRF_HW_ASYNC=y
92+
- CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
93+
- CONFIG_NRFX_TIMER2=y
8894
- CONFIG_UART_0_ENHANCED_POLL_OUT=y
8995
platform_exclude:
9096
- nrf54l09pdk/nrf54l09/cpuapp

0 commit comments

Comments
 (0)