tests: drivers: uart: Extend testing for nrf54h20 (including UARTE120 and cpuppr)

drivers/serial/uart_nrfx_uarte.c

@@ -242,6 +242,9 @@
 /* If enabled then UARTE peripheral is using memory which is cacheable. */
 #define UARTE_CFG_FLAG_CACHEABLE BIT(3)
 
+/* If enabled then pins must be retained when UARTE is disabled. */
+#define UARTE_CFG_FLAG_RETAIN_PINS BIT(4)
+
 /* Macro for converting numerical baudrate to register value. It is convenient
  * to use this approach because for constant input it can calculate nrf setting
  * at compile time.
@@ -590,6 +593,11 @@
 
 	(void)data;
 	nrf_uarte_enable(uarte);
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	if (config->flags & UARTE_CFG_FLAG_RETAIN_PINS) {
+		nrf_gpd_retain_pins_set(config->pcfg, false);
+	}
+#endif
 #if UARTE_BAUDRATE_RETENTION_WORKAROUND
 	nrf_uarte_baudrate_set(uarte,
 		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,
@@ -702,6 +710,13 @@
 	}
 #endif
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	const struct uarte_nrfx_config *cfg = dev->config;
+
+	if (cfg->flags & UARTE_CFG_FLAG_RETAIN_PINS) {
+		nrf_gpd_retain_pins_set(cfg->pcfg, true);
+	}
+#endif
 	nrf_uarte_disable(get_uarte_instance(dev));
 }
 
@@ -2103,9 +2118,6 @@
 
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
 		uarte_periph_enable(dev);
-#ifdef CONFIG_SOC_NRF54H20_GPD
-		nrf_gpd_retain_pins_set(cfg->pcfg, false);
-#endif
 	}
 }
 
@@ -2169,7 +2181,9 @@
 	}
 
 #ifdef CONFIG_SOC_NRF54H20_GPD
-	nrf_gpd_retain_pins_set(cfg->pcfg, true);
+	if (cfg->flags & UARTE_CFG_FLAG_RETAIN_PINS) {
+		nrf_gpd_retain_pins_set(cfg->pcfg, true);
+	}
 #endif
 
 	nrf_uarte_disable(uarte);
@@ -2383,6 +2397,8 @@
 			(!IS_ENABLED(CONFIG_HAS_NORDIC_DMM) ? 0 :	       \
 			  (UARTE_IS_CACHEABLE(idx) ?			       \
 				UARTE_CFG_FLAG_CACHEABLE : 0)) |	       \
+			(UARTE_PROP(idx, pin_retention) ?		       \
+				UARTE_CFG_FLAG_RETAIN_PINS : 0) |	       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
 		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
@@ -2415,7 +2431,7 @@
 		      PRE_KERNEL_1,					       \
 		      CONFIG_SERIAL_INIT_PRIORITY,			       \
 		      &uart_nrfx_uarte_driver_api)
 
 #define UARTE_INT_DRIVEN(idx)						       \
 	IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN,		       \
 		(static uint8_t uarte##idx##_tx_buffer			       \

dts/bindings/serial/nordic,nrf-uarte.yaml

@@ -14,3 +14,9 @@ properties:
     type: boolean
     description: |
       UARTE has RX frame timeout HW feature.
+  pin-retention:
+    type: boolean
+    description: |
+      UARTE pin states must be retained when peripheral is disabled.
+      It is required when CTRLSEL is used to route UARTE pins. It is always the
+      case for fast peripheral and in special cases for slow peripherals.

dts/common/nordic/nrf54h20.dtsi

@@ -669,6 +669,7 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
+				pin-retention;
 			};
 
 			spi121: spi@8e7000 {

dts/common/nordic/nrf9280.dtsi

@@ -508,6 +508,7 @@
 				interrupts = <230 NRF_DEFAULT_IRQ_PRIORITY>;
 				endtx-stoptx-supported;
 				frame-timeout-supported;
+				pin-retention;
 			};
 
 			spi121: spi@8e7000 {

tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_common.dtsi

@@ -3,8 +3,11 @@
 &pinctrl {
 	uart137_default_alt: uart137_default_alt {
 		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 6)>,
-				<NRF_PSEL(UART_RX, 0, 7)>;
+			psels = <NRF_PSEL(UART_TX, 0, 6)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 7)>;
+			bias-pull-up;
 		};
 	};
 
@@ -15,6 +18,23 @@
 			low-power-enable;
 		};
 	};
+	uart120_default_alt: uart120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 7, 7)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 7, 4)>;
+			bias-pull-up;
+		};
+	};
+
+	uart120_sleep_alt: uart120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 7, 7)>,
+				<NRF_PSEL(UART_RX, 7, 4)>;
+			low-power-enable;
+		};
+	};
 };
 
 dut: &uart137 {
@@ -24,3 +44,11 @@ dut: &uart137 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 };
+
+dut2: &uart120 {
+	status = "okay";
+	pinctrl-0 = <&uart120_default_alt>;
+	pinctrl-1 = <&uart120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <115200>;
+};

tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -5,3 +5,11 @@
 &dut {
 	memory-regions = <&cpuapp_dma_region>;
 };
+
+&dut2 {
+	memory-regions = <&dma_fast_region>;
+};
+
+&dma_fast_region {
+	status = "okay";
+};

tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpuppr.overlay

@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54h20dk_nrf54h20_common.dtsi"
+
+dut2: &uart120 {
+	status = "disabled";
+};

tests/drivers/uart/uart_async_api/boards/nrf54h20dk_nrf54h20_cpurad.overlay

@@ -2,6 +2,18 @@
 
 #include "nrf54h20dk_nrf54h20_common.dtsi"
 
+&cpurad_dma_region {
+	reg = <0xe80 DT_SIZE_K(4)>;
+};
+
 &dut {
 	memory-regions = <&cpurad_dma_region>;
 };
+
+&dma_fast_region {
+	status = "okay";
+};
+
+&dut2 {
+	memory-regions = <&dma_fast_region>;
+};