[nrf fromlist] drivers: serial: uart_nrfx_uarte: align to changes in nrfx

Align driver to changes in nrfx UARTE driver.

Upstream PR #: 96858

Signed-off-by: Michał Bainczyk <[email protected]>

Author: mib1-nordic

drivers/serial/Kconfig.nrfx

@@ -213,37 +213,25 @@ nrfx_uart_num = 137
 rsource "Kconfig.nrfx_uart_instance"
 endif
 
-config NRFX_TIMER0
+config NRFX_TIMER
 	default y
 	depends on UART_0_NRF_HW_ASYNC_TIMER = 0 \
 		|| UART_1_NRF_HW_ASYNC_TIMER = 0 \
 		|| UART_2_NRF_HW_ASYNC_TIMER = 0 \
-		|| UART_3_NRF_HW_ASYNC_TIMER = 0
-
-config NRFX_TIMER1
-	default y
-	depends on UART_0_NRF_HW_ASYNC_TIMER = 1 \
+		|| UART_3_NRF_HW_ASYNC_TIMER = 0 \
+		|| UART_0_NRF_HW_ASYNC_TIMER = 1 \
 		|| UART_1_NRF_HW_ASYNC_TIMER = 1 \
 		|| UART_2_NRF_HW_ASYNC_TIMER = 1 \
-		|| UART_3_NRF_HW_ASYNC_TIMER = 1
-
-config NRFX_TIMER2
-	default y
-	depends on UART_0_NRF_HW_ASYNC_TIMER = 2 \
+		|| UART_3_NRF_HW_ASYNC_TIMER = 1 \
+		|| UART_0_NRF_HW_ASYNC_TIMER = 2 \
 		|| UART_1_NRF_HW_ASYNC_TIMER = 2 \
 		|| UART_2_NRF_HW_ASYNC_TIMER = 2 \
-		|| UART_3_NRF_HW_ASYNC_TIMER = 2
-
-config NRFX_TIMER3
-	default y
-	depends on UART_0_NRF_HW_ASYNC_TIMER = 3 \
+		|| UART_3_NRF_HW_ASYNC_TIMER = 2 \
+		|| UART_0_NRF_HW_ASYNC_TIMER = 3 \
 		|| UART_1_NRF_HW_ASYNC_TIMER = 3 \
 		|| UART_2_NRF_HW_ASYNC_TIMER = 3 \
-		|| UART_3_NRF_HW_ASYNC_TIMER = 3
-
-config NRFX_TIMER4
-	default y
-	depends on UART_0_NRF_HW_ASYNC_TIMER = 4 \
+		|| UART_3_NRF_HW_ASYNC_TIMER = 3 \
+		|| UART_0_NRF_HW_ASYNC_TIMER = 4 \
 		|| UART_1_NRF_HW_ASYNC_TIMER = 4 \
 		|| UART_2_NRF_HW_ASYNC_TIMER = 4 \
 		|| UART_3_NRF_HW_ASYNC_TIMER = 4

drivers/serial/uart_nrfx_uarte.c

@@ -306,6 +306,7 @@ struct uarte_nrfx_data {
 #endif
 #ifdef UARTE_ANY_ASYNC
 	struct uarte_async_cb *async;
+	nrfx_timer_t timer;
 #endif
 	atomic_val_t poll_out_lock;
 	atomic_t flags;
@@ -448,7 +449,6 @@ struct uarte_nrfx_config {
 	size_t bounce_buf_swap_len;
 	struct uarte_async_rx_cbwt *cbwt_data;
 #endif
-	nrfx_timer_t timer;
 	uint8_t *tx_cache;
 	uint8_t *rx_flush_buf;
 #endif
@@ -521,7 +521,7 @@ static void uarte_disable_locked(const struct device *dev, uint32_t dis_mask)
 
 #if defined(UARTE_ANY_ASYNC) && !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 	if (data->async && HW_RX_COUNTING_ENABLED(config)) {
-		nrfx_timer_disable(&config->timer);
+		nrfx_timer_disable(&data->timer);
 		/* Timer/counter value is reset when disabled. */
 		data->async->rx.total_byte_cnt = 0;
 		data->async->rx.total_user_byte_cnt = 0;
@@ -878,7 +878,7 @@ static void uarte_periph_enable(const struct device *dev)
 #ifdef UARTE_ANY_ASYNC
 	if (data->async) {
 		if (HW_RX_COUNTING_ENABLED(config)) {
-			const nrfx_timer_t *timer = &config->timer;
+			nrfx_timer_t *timer = &data->timer;
 
 			nrfx_timer_enable(timer);
 
@@ -1067,26 +1067,26 @@ static int uarte_nrfx_rx_counting_init(const struct device *dev)
 
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
 		nrfx_timer_config_t tmr_config = NRFX_TIMER_DEFAULT_CONFIG(
-						NRF_TIMER_BASE_FREQUENCY_GET(cfg->timer.p_reg));
+						NRF_TIMER_BASE_FREQUENCY_GET(data->timer.p_reg));
 		uint32_t evt_addr = nrf_uarte_event_address_get(uarte, NRF_UARTE_EVENT_RXDRDY);
-		uint32_t tsk_addr = nrfx_timer_task_address_get(&cfg->timer, NRF_TIMER_TASK_COUNT);
+		uint32_t tsk_addr = nrfx_timer_task_address_get(&data->timer, NRF_TIMER_TASK_COUNT);
 
 		tmr_config.mode = NRF_TIMER_MODE_COUNTER;
 		tmr_config.bit_width = NRF_TIMER_BIT_WIDTH_32;
-		ret = nrfx_timer_init(&cfg->timer,
+		ret = nrfx_timer_init(&data->timer,
 				      &tmr_config,
 				      timer_handler);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Timer already initialized");
 			return -EINVAL;
 		}
 
-		nrfx_timer_clear(&cfg->timer);
+		nrfx_timer_clear(&data->timer);
 
 		ret = nrfx_gppi_channel_alloc(&data->async->rx.cnt.ppi);
 		if (ret != NRFX_SUCCESS) {
 			LOG_ERR("Failed to allocate PPI Channel");
-			nrfx_timer_uninit(&cfg->timer);
+			nrfx_timer_uninit(&data->timer);
 			return -EINVAL;
 		}
 
@@ -2258,7 +2258,7 @@ static void rx_timeout(struct k_timer *timer)
 			      NRF_UARTE_INT_ENDRX_MASK);
 
 	if (HW_RX_COUNTING_ENABLED(cfg)) {
-		read = nrfx_timer_capture(&cfg->timer, 0);
+		read = nrfx_timer_capture(&data->timer, 0);
 	} else {
 		read = async_rx->cnt.cnt;
 	}
@@ -3241,7 +3241,7 @@ static void uarte_pm_suspend(const struct device *dev)
 
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
 		if (data->async && HW_RX_COUNTING_ENABLED(cfg)) {
-			nrfx_timer_disable(&cfg->timer);
+			nrfx_timer_disable(&data->timer);
 			/* Timer/counter value is reset when disabled. */
 			data->async->rx.total_byte_cnt = 0;
 			data->async->rx.total_user_byte_cnt = 0;
@@ -3597,6 +3597,9 @@ static int uarte_instance_deinit(const struct device *dev)
 				(.uart_config = UARTE_CONFIG(idx),))	       \
 		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
 			    (.async = &uarte##idx##_async,))		       \
+		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
+			    (.timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(  \
+				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER)),))    \
 		IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN,	       \
 			    (.int_driven = &uarte##idx##_int_driven,))	       \
 	};								       \
@@ -3638,9 +3641,6 @@ static int uarte_instance_deinit(const struct device *dev)
 				 .rx_flush_buf = uarte##idx##_flush_buf,))     \
 		IF_ENABLED(CONFIG_UARTE_NRFX_UARTE_COUNT_BYTES_WITH_TIMER,     \
 			(UARTE_COUNT_BYTES_WITH_TIMER_CONFIG(idx)))	       \
-		IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC,		       \
-			(.timer = NRFX_TIMER_INSTANCE(			       \
-				CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),))     \
 		IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _),	       \
 			(.clk_dev = DEVICE_DT_GET_OR_NULL(DT_CLOCKS_CTLR(UARTE(idx))), \
 			 .clk_spec = {					       \