samples: openthread: Align with USB changes

rlubos · rlubos · commit 2532d4c5e9f2 · 2021-11-09T12:30:05.000+01:00
Align OpenThread samples with USB changes.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/samples/openthread/cli/overlay-usb.conf b/samples/openthread/cli/overlay-usb.conf
@@ -7,7 +7,6 @@
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_SHELL_ON_DEV_NAME="CDC_ACM_0"
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml
@@ -26,6 +26,7 @@ tests:
     platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840
     tags: ci_build
     extra_args: OVERLAY_CONFIG=overlay-usb.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp
       - nrf5340dk_nrf5340_cpuapp_ns
diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c
@@ -41,7 +41,7 @@ void main(void)
 		return;
 	}
 
-	dev = device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
+	dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
 	if (dev == NULL) {
 		LOG_ERR("Failed to find specific UART device");
 		return;
diff --git a/samples/openthread/cli/usb.overlay b/samples/openthread/cli/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/openthread/coprocessor/overlay-usb.conf b/samples/openthread/coprocessor/overlay-usb.conf
@@ -4,10 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Use USB-CDC-ACM for Co-Processor
-CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_ACM=y
-CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_DEV_NAME="CDC_ACM_0"
-
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_CDC_ACM=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml
@@ -24,7 +24,8 @@ tests:
     build_only: true
     platform_allow: nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840
     tags: ci_build
-    extra_args: OVERLAY_CONFIG=overlay-usb.conf;
+    extra_args: OVERLAY_CONFIG=overlay-usb.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf52840dongle_nrf52840
diff --git a/samples/openthread/coprocessor/usb.overlay b/samples/openthread/coprocessor/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,ot-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void main(void)`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`44`		`- dev = device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);`
	`44`	`+ dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));`
`45`	`45`	`if (dev == NULL) {`
`46`	`46`	`LOG_ERR("Failed to find specific UART device");`
`47`	`47`	`return;`