samples: DTM: nRF54H20 transport over USB CDC ACM

Added support for USB CDC ACM trasnport layer for nRF54H20.

JIRA: NCSDK-34868

Signed-off-by: Michał Strządała <[email protected]>

Author: Tryton77

samples/bluetooth/direct_test_mode/Kconfig

@@ -35,8 +35,8 @@ config ANOMALY_172_TIMER_IRQ_PRIORITY
 	  Levels are from 0 (highest priority) to 6 (lowest priority)
 
 config DTM_USB
-	bool "DTM over USB CDC ACM class"
-	depends on SOC_NRF5340_CPUNET && !DTM_TRANSPORT_HCI
+	bool "DTM over USB CDC ACM class [EXPERIMENTAL]"
+	depends on (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD) && !DTM_TRANSPORT_HCI
 	select EXPERIMENTAL
 	help
 	  Use USB instead of UART as the DTM interface. For nRF5340 the USB from application core

samples/bluetooth/direct_test_mode/README.rst

@@ -401,19 +401,26 @@ On the |nRF5340DKnoref|, you can build the sample with HCI interface with the ``
 USB CDC ACM transport variant
 =============================
 
-On the nRF5340 development kit, you can build this sample configured to use the USB interface as a communication interface with the tester.
-Use the following command:
+On the nRF5340 and nRF54H20 development kits, you can build this sample configured to use the USB interface as a communication interface with the tester.
+
+Use the following command for nRF54H20:
+
+.. code-block:: console
+
+   west build samples/bluetooth/direct_test_mode -b nrf54h20dk/nrf54h20/cpurad -- -DFILE_SUFFIX=usb_54h20
+
+Use the following command for nRF5340:
 
 .. code-block:: console
 
-   west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DFILE_SUFFIX=usb
+   west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DFILE_SUFFIX=usb_5340
 
 You can also build this sample with support for the front-end module.
 Use the following command:
 
 .. code-block:: console
 
-   west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DSHIELD=nrf21540ek -DFILE_SUFFIX=usb
+   west build samples/bluetooth/direct_test_mode -b nrf5340dk/nrf5340/cpunet -- -DSHIELD=nrf21540ek -DFILE_SUFFIX=usb_5340
 
 .. _dtm_testing:
 

samples/bluetooth/direct_test_mode/boards/nrf54h20dk_nrf54h20_cpurad_usb_54h20.overlay

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf54h20dk_nrf54h20_cpurad.overlay"
+
+/ {
+	chosen {
+		ncs,dtm-uart = &cdc_acm_uart0;
+	};
+};
+
+&uart135 {
+	status = "disabled";
+};
+
+&uart136 {
+	status = "disabled";
+};
+
+&zephyr_udc0 {
+	status = "okay";
+
+	cdc_acm_uart0: cdc_acm_uart0 {
+		status = "okay";
+		compatible = "zephyr,cdc-acm-uart";
+		current-speed = <19200>;
+	};
+};

samples/bluetooth/direct_test_mode/prj_usb.conf renamed to samples/bluetooth/direct_test_mode/prj_usb_5340.conf

@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+CONFIG_ASSERT=y
+CONFIG_ASSERT_NO_COND_INFO=y
+CONFIG_ASSERT_NO_MSG_INFO=y
+
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+
+CONFIG_LOG=y
+CONFIG_LOG_PRINTK=y
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_LOG_BACKEND_RTT=y
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+# Enable USB CDC ACM Class
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
+CONFIG_CDC_ACM_SERIAL_PID=0x5448
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic DTM USB"
+CONFIG_UART_LINE_CTRL=y
+CONFIG_DTM_USB=y
+CONFIG_SERIAL=y
+
+# Disable the unsupported driver
+CONFIG_NRFX_TIMER0=n
+CONFIG_NRFX_TIMER2=n
+
+# Use necessary peripherals
+CONFIG_NRFX_TIMER020=y
+CONFIG_NRFX_GPPI=y
+CONFIG_CLOCK_CONTROL=y

samples/bluetooth/direct_test_mode/prj_usb_54h20.conf

@@ -63,7 +63,7 @@ tests:
   sample.bluetooth.direct_test_mode.nrf5340_usb:
     sysbuild: true
     build_only: true
-    extra_args: FILE_SUFFIX=usb
+    extra_args: FILE_SUFFIX=usb_5340
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
     platform_allow: nrf5340dk/nrf5340/cpunet
@@ -76,7 +76,7 @@ tests:
     build_only: true
     extra_args:
       - SHIELD=nrf21540ek
-      - FILE_SUFFIX=usb
+      - FILE_SUFFIX=usb_5340
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
     platform_allow: nrf5340dk/nrf5340/cpunet
@@ -127,11 +127,22 @@ tests:
     build_only: true
     extra_args:
       - SHIELD=nrf2220ek
-      - FILE_SUFFIX=usb
+      - FILE_SUFFIX=usb_5340
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
     platform_allow: nrf5340dk/nrf5340/cpunet
     tags:
       - bluetooth
       - ci_build
       - sysbuild
+  sample.bluetooth.direct_test_mode.nrf54h20_usb:
+    sysbuild: true
+    build_only: true
+    extra_args: FILE_SUFFIX=usb_54h20
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpurad
+    platform_allow: nrf54h20dk/nrf54h20/cpurad
+    tags:
+      - bluetooth
+      - ci_build
+      - sysbuild

samples/bluetooth/direct_test_mode/sample.yaml

@@ -759,6 +759,14 @@ int dtm_tr_init(void)
 		return -EIO;
 	}
 
+#if defined(CONFIG_DTM_USB) && defined(CONFIG_SOC_NRF54H20_CPURAD)
+	/* Enable RX path for the USB CDC ACM.
+	 * uart_irq_rx_enable() -> cdc_acm_irq_rx_enable() -> cdc_acm_work_submit(rx_fifo_work)
+	 * It is not needed for non CDC ACM UARTs.
+	 */
+	uart_irq_rx_enable(dtm_uart);
+#endif /* defined(CONFIG_DTM_USB) && defined(CONFIG_SOC_NRF54H20_CPURAD) */
+
 	err = dtm_init(NULL);
 	if (err) {
 		LOG_ERR("Error during DTM initialization: %d", err);