Skip to content

Commit ab100eb

Browse files
committed
drivers: serial: uart_nrfx_uarte: align to changes in nrfx
Align driver to changes in nrfx UARTE driver. Signed-off-by: Michał Bainczyk <michal.bainczyk@nordicsemi.no>
1 parent 24e5e6b commit ab100eb

File tree

2 files changed

+4
-39
lines changed

2 files changed

+4
-39
lines changed

drivers/serial/Kconfig.nrfx

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -187,39 +187,4 @@ nrfx_uart_num = 137
187187
rsource "Kconfig.nrfx_uart_instance"
188188
endif
189189

190-
config NRFX_TIMER0
191-
default y
192-
depends on UART_0_NRF_HW_ASYNC_TIMER = 0 \
193-
|| UART_1_NRF_HW_ASYNC_TIMER = 0 \
194-
|| UART_2_NRF_HW_ASYNC_TIMER = 0 \
195-
|| UART_3_NRF_HW_ASYNC_TIMER = 0
196-
197-
config NRFX_TIMER1
198-
default y
199-
depends on UART_0_NRF_HW_ASYNC_TIMER = 1 \
200-
|| UART_1_NRF_HW_ASYNC_TIMER = 1 \
201-
|| UART_2_NRF_HW_ASYNC_TIMER = 1 \
202-
|| UART_3_NRF_HW_ASYNC_TIMER = 1
203-
204-
config NRFX_TIMER2
205-
default y
206-
depends on UART_0_NRF_HW_ASYNC_TIMER = 2 \
207-
|| UART_1_NRF_HW_ASYNC_TIMER = 2 \
208-
|| UART_2_NRF_HW_ASYNC_TIMER = 2 \
209-
|| UART_3_NRF_HW_ASYNC_TIMER = 2
210-
211-
config NRFX_TIMER3
212-
default y
213-
depends on UART_0_NRF_HW_ASYNC_TIMER = 3 \
214-
|| UART_1_NRF_HW_ASYNC_TIMER = 3 \
215-
|| UART_2_NRF_HW_ASYNC_TIMER = 3 \
216-
|| UART_3_NRF_HW_ASYNC_TIMER = 3
217-
218-
config NRFX_TIMER4
219-
default y
220-
depends on UART_0_NRF_HW_ASYNC_TIMER = 4 \
221-
|| UART_1_NRF_HW_ASYNC_TIMER = 4 \
222-
|| UART_2_NRF_HW_ASYNC_TIMER = 4 \
223-
|| UART_3_NRF_HW_ASYNC_TIMER = 4
224-
225190
endif # UART_NRFX

drivers/serial/uart_nrfx_uarte.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ struct uarte_nrfx_data {
271271
#endif
272272
#ifdef UARTE_ANY_ASYNC
273273
struct uarte_async_cb *async;
274+
nrfx_timer_t timer;
274275
#endif
275276
atomic_val_t poll_out_lock;
276277
atomic_t flags;
@@ -386,7 +387,6 @@ struct uarte_nrfx_config {
386387
#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
387388

388389
#ifdef UARTE_ANY_ASYNC
389-
nrfx_timer_t timer;
390390
uint8_t *tx_cache;
391391
uint8_t *rx_flush_buf;
392392
#endif
@@ -795,7 +795,7 @@ static void uarte_periph_enable(const struct device *dev)
795795
#ifdef UARTE_ANY_ASYNC
796796
if (data->async) {
797797
if (HW_RX_COUNTING_ENABLED(config)) {
798-
const nrfx_timer_t *timer = &config->timer;
798+
nrfx_timer_t *timer = &data->timer;
799799

800800
nrfx_timer_enable(timer);
801801

@@ -2777,8 +2777,8 @@ static int uarte_instance_deinit(const struct device *dev)
27772777
(.tx_cache = uarte##idx##_tx_cache, \
27782778
.rx_flush_buf = uarte##idx##_flush_buf,)) \
27792779
IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC, \
2780-
(.timer = NRFX_TIMER_INSTANCE( \
2781-
CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),)) \
2780+
(.timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET( \
2781+
CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER)),)) \
27822782
IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _), \
27832783
(.clk_dev = DEVICE_DT_GET_OR_NULL(DT_CLOCKS_CTLR(UARTE(idx))), \
27842784
.clk_spec = { \

0 commit comments

Comments
 (0)