drivers: serial: Remove deprecated uart_nrfx_uarte2 driver

Use of uart_nrfx_uarte2 driver was deprecated before 4.1 release
and now can be removed.

Signed-off-by: Krzysztof Chruściński <[email protected]>

Author: nordic-krch

drivers/serial/CMakeLists.txt

@@ -60,6 +60,7 @@ zephyr_library_sources_ifdef(CONFIG_UART_MSPM0 uart_mspm0.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NEORV32 uart_neorv32.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NPCX uart_npcx.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NRFX_UART uart_nrfx_uart.c)
+zephyr_library_sources_ifdef(CONFIG_UART_NRFX_UARTE uart_nrfx_uarte.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NS16550 uart_ns16550.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NUMAKER uart_numaker.c)
 zephyr_library_sources_ifdef(CONFIG_UART_NUMICRO uart_numicro.c)
@@ -110,16 +111,6 @@ zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c)
 # zephyr-keep-sorted-stop
 
-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()
-
 if(CONFIG_UART_NATIVE_PTY)
   zephyr_library_compile_definitions(NO_POSIX_CHEATS)
   zephyr_library_sources(uart_native_pty.c)

drivers/serial/Kconfig.nrfx

@@ -25,8 +25,6 @@ config UART_NRFX_UART
 config UART_NRFX_UARTE
 	def_bool y
 	depends on DT_HAS_NORDIC_NRF_UARTE_ENABLED
-	imply NRFX_UARTE_CONFIG_SKIP_PSEL_CONFIG if !UART_NRFX_UARTE_LEGACY_SHIM
-	imply NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG if !UART_NRFX_UARTE_LEGACY_SHIM
 
 config UART_NRFX_UARTE_NO_IRQ
 	bool "Polling without interrupt"
@@ -36,23 +34,9 @@ config UART_NRFX_UARTE_NO_IRQ
 	  When enabled, then interrupt handler is not used at all and it is possible
 	  to get to the lowest power state after uart_poll_out if receiver is not used.
 
-config UART_NRFX_UARTE_LEGACY_SHIM
-	bool "Legacy UARTE shim"
-	depends on UART_NRFX_UARTE
-	default y
-	help
-	  Disabling this option is deprecated.
-
-config DEPRECATED_UART_NRFX_UARTE_LEGACY_SHIM
-	bool
-	default y if !UART_NRFX_UARTE_LEGACY_SHIM
-	depends on UART_NRFX_UARTE
-	select DEPRECATED
-
 config UART_NRFX_UARTE_ENHANCED_RX
 	bool "Enhanced RX handling"
 	depends on UART_ASYNC_API
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	depends on !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
 	default y
 	help
@@ -65,7 +49,6 @@ config UART_NRFX_UARTE_ENHANCED_RX
 config UART_ASYNC_TX_CACHE_SIZE
 	int "TX cache buffer size"
 	depends on UART_ASYNC_API
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	default 8
 	help
 	  For UARTE, TX cache buffer is used when provided TX buffer is not located

drivers/serial/Kconfig.nrfx_uart_instance

@@ -6,7 +6,6 @@
 config UART_$(nrfx_uart_num)_INTERRUPT_DRIVEN
 	bool "Interrupt support on port $(nrfx_uart_num)"
 	depends on UART_INTERRUPT_DRIVEN
-	select UART_ASYNC_TO_INT_DRIVEN_API if !UART_NRFX_UARTE_LEGACY_SHIM
 	default y
 	help
 	  This option enables UART interrupt support on port $(nrfx_uart_num).
@@ -29,9 +28,6 @@ config UART_$(nrfx_uart_num)_ENHANCED_POLL_OUT
 	  When enabled, polling out does not trigger interrupt which stops TX.
 	  Feature uses a PPI channel.
 
-config NRFX_UARTE$(nrfx_uart_num)
-	def_bool y if HAS_HW_NRF_UARTE$(nrfx_uart_num) && !UART_NRFX_UARTE_LEGACY_SHIM
-
 config UART_$(nrfx_uart_num)_NRF_PARITY_BIT
 	bool "Parity bit"
 	help
@@ -40,7 +36,6 @@ config UART_$(nrfx_uart_num)_NRF_PARITY_BIT
 config UART_$(nrfx_uart_num)_NRF_TX_BUFFER_SIZE
 	int "Size of RAM buffer"
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	range 1 $(UINT16_MAX)
 	default 32
 	help
@@ -52,7 +47,6 @@ config UART_$(nrfx_uart_num)_NRF_HW_ASYNC
 	bool "Use hardware RX byte counting"
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
 	select NRFX_GPPI
 	help
@@ -65,7 +59,6 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	bool "Low power mode"
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
-	depends on UART_NRFX_UARTE_LEGACY_SHIM
 	default y if !PM_DEVICE
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
@@ -78,46 +71,3 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 config UART_$(nrfx_uart_num)_NRF_HW_ASYNC_TIMER
 	int "Timer instance"
 	depends on UART_$(nrfx_uart_num)_NRF_HW_ASYNC
-
-config UART_$(nrfx_uart_num)_HAS_RX_CACHE_SECTION
-	def_bool $(dt_nodelabel_has_prop,uart$(nrfx_uart_num),memory-regions)
-	imply NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
-	help
-	  This helper symbol indicates the existence of a linker section which
-	  can be dedicated to an RX cache buffer.
-
-config UART_$(nrfx_uart_num)_TX_CACHE_SIZE
-	int "TX cache buffer size"
-	depends on !UART_NRFX_UARTE_LEGACY_SHIM
-	default 8
-	help
-	  For UARTE, TX cache buffer is used when provided TX buffer is not located
-	  in memory which can be used by the EasyDMA.
-
-config UART_$(nrfx_uart_num)_RX_CACHE_SIZE
-	int "RX cache buffer size"
-	depends on !UART_NRFX_UARTE_LEGACY_SHIM
-	default 32 if UART_$(nrfx_uart_num)_HAS_RX_CACHE_SECTION
-	default 5
-	range 5 $(UINT8_MAX)
-	help
-	  For UARTE, RX cache buffer is used when provided RX buffer is not located
-	  in memory which can be used by the EasyDMA. It is also used to store
-	  flushed data.
-
-config UART_$(nrfx_uart_num)_A2I_RX_SIZE
-	depends on !UART_NRFX_UARTE_LEGACY_SHIM
-	int "Asynchronous to interrupt driven adaptation layer RX buffer size"
-	default 64 if UART_$(nrfx_uart_num)_INTERRUPT_DRIVEN
-	default 0
-	help
-	  Amount of space dedicated for RX. It is divided into chunks with some
-	  amount of that space used for control data.
-
-config UART_$(nrfx_uart_num)_A2I_RX_BUF_COUNT
-	depends on !UART_NRFX_UARTE_LEGACY_SHIM
-	int "Asynchronous to interrupt driven adaptation layer RX buffer count"
-	default 8 if UART_$(nrfx_uart_num)_INTERRUPT_DRIVEN
-	default 0
-	help
-	  Number of chunks into RX space is divided.