applications: Align with USB changes

Align other apps with USB changes.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf

@@ -164,7 +164,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
 # Use CDC_ACM_0 for UART console
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 ################################################################################
 # Bootloader Configuration

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay

@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf

@@ -164,7 +164,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
 # Use CDC_ACM_0 for UART console
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 ################################################################################
 # Bootloader Configuration

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/dts.overlay

@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };

applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/dts.overlay

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};

applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf

@@ -117,10 +117,7 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_SHELL_ON_DEV_NAME="CDC_ACM_0"
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 
 # Configure Thingy:53 sensors

applications/matter_weather_station/thingy53_nrf5340_cpuapp.overlay

@@ -60,6 +60,18 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
 
 &i2c1 {