zephyrproject-rtos · jfischer-no · Nov 20, 2024 · Jun 12, 2025 · Nov 4, 2024 · Mar 17, 2025
diff --git a/boards/common/usb/Kconfig.cdc_acm_serial.defconfig b/boards/common/usb/Kconfig.cdc_acm_serial.defconfig
@@ -23,23 +23,20 @@ config SHELL_BACKEND_SERIAL_CHECK_DTR
 config UART_LINE_CTRL
 	default SHELL
 
-config USB_DEVICE_STACK
-	default y
-
-config USB_DEVICE_INITIALIZE_AT_BOOT
+config USB_DEVICE_STACK_NEXT
 	default y if !MCUBOOT
 
-config USB_DEVICE_REMOTE_WAKEUP
-	default n
+config CDC_ACM_SERIAL_INITIALIZE_AT_BOOT
+	default y if !MCUBOOT
 
 if LOG
 
-choice USB_CDC_ACM_LOG_LEVEL_CHOICE
-	default USB_CDC_ACM_LOG_LEVEL_OFF
+choice USBD_CDC_ACM_LOG_LEVEL_CHOICE
+	default USBD_CDC_ACM_LOG_LEVEL_OFF
 endchoice
 
-choice USB_DEVICE_LOG_LEVEL_CHOICE
-	default USB_DEVICE_LOG_LEVEL_OFF
+choice USBD_LOG_LEVEL_CHOICE
+	default USBD_LOG_LEVEL_OFF
 endchoice
 
 # Wait 4000ms at startup for logging

diff --git a/boards/nxp/usb_kw24d512/usb_kw24d512.yaml b/boards/nxp/usb_kw24d512/usb_kw24d512.yaml
@@ -10,5 +10,6 @@ toolchain:
 supported:
   - flash
   - usb_device
+  - usbd
   - watchdog
 vendor: nxp
diff --git a/boards/peregrine/sam4l_wm400_cape/Kconfig.defconfig b/boards/peregrine/sam4l_wm400_cape/Kconfig.defconfig
@@ -17,6 +17,4 @@ endif # NETWORKING
 config USE_DT_CODE_PARTITION
 	default y
 
-source "boards/common/usb/Kconfig.cdc_acm_serial.defconfig"
-
 endif # BOARD_SAM4L_WM400_CAPE
diff --git a/boards/peregrine/sam4l_wm400_cape/sam4l_wm400_cape.dts b/boards/peregrine/sam4l_wm400_cape/sam4l_wm400_cape.dts
@@ -23,6 +23,8 @@
 	};
 
 	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition= &code_partition;
@@ -185,5 +187,3 @@ zephyr_udc0: &usbc {
 	pinctrl-0 = <&usbc_default>;
 	pinctrl-names = "default";
 };
-
-#include <../boards/common/usb/cdc_acm_serial.dtsi>
diff --git a/doc/connectivity/usb/device/api/index.rst b/doc/connectivity/usb/device/api/index.rst
@@ -1,7 +1,7 @@
 .. _usb_api:
 
-USB device support APIs
-#######################
+USB device support APIs (deprecated)
+####################################
 
 .. toctree::
    :maxdepth: 1

diff --git a/doc/connectivity/usb/device/api/usb_dc.rst b/doc/connectivity/usb/device/api/usb_dc.rst
@@ -1,7 +1,7 @@
 .. _usb_dc_api:
 
-USB device controller driver API
-################################
+USB device controller driver API (deprecated)
+#############################################
 
 The USB device controller driver API is described in
 :zephyr_file:`include/zephyr/drivers/usb/usb_dc.h` and sometimes referred to

diff --git a/doc/connectivity/usb/device/api/usb_device.rst b/doc/connectivity/usb/device/api/usb_device.rst
@@ -1,7 +1,7 @@
 .. _usb_device_stack_api:
 
-USB device stack API
-####################
+USB device stack API (deprecated)
+#################################
 
 API reference
 *************

diff --git a/doc/connectivity/usb/device/api/usb_device_bos.rst b/doc/connectivity/usb/device/api/usb_device_bos.rst
@@ -1,7 +1,7 @@
 .. _usb_bos_api:
 
-Binary Device Object Store (BOS) support API
-############################################
+Binary Device Object Store (BOS) support API (deprecated)
+#########################################################
 
 API reference
 *************

diff --git a/doc/connectivity/usb/device/api/usb_device_hid.rst b/doc/connectivity/usb/device/api/usb_device_hid.rst
@@ -1,7 +1,7 @@
 .. _usb_hid_device:
 
-USB HID Class API
-#################
+USB HID Class API (deprecated)
+##############################
 
 USB device specific part for HID support defined in
 :zephyr_file:`include/zephyr/usb/class/usb_hid.h`.

diff --git a/doc/connectivity/usb/device/usb_device.rst b/doc/connectivity/usb/device/usb_device.rst
@@ -1,7 +1,7 @@
 .. _usb_device_stack:
 
-USB device support
-##################
+USB device support (deprecated)
+###############################
 
 .. contents::
     :local:
@@ -26,10 +26,9 @@ over time. It provides the following functionalities:
   :zephyr_file:`include/zephyr/usb/usb_device.h`
 
 .. note::
-   It is planned to deprecate all APIs listed in :ref:`usb_api` and the
-   functions that depend on them between Zephyr v4.1.0 and v4.2.0, and remove
-   them in v4.4.0. The new USB device support, represented by the APIs in
-   :ref:`usb_device_next_api`, will become the default in Zephyr v4.2.0.
+   All APIs listed in :ref:`usb_api` and the functions that depend on them are
+   deprecated and will be remove in v4.4.0. Please use the new USB device
+   support represented by the APIs in :ref:`usb_device_next_api`.
 
 Supported USB classes
 *********************
@@ -212,7 +211,7 @@ DFU
 USB DFU class implementation is tightly coupled to :ref:`dfu` and :ref:`mcuboot_api`.
 This means that the target platform must support the :ref:`flash_img_api` API.
 
-See :zephyr:code-sample:`usb-dfu` sample for reference.
+See :zephyr:code-sample:`legacy-usb-dfu` sample for reference.
 
 USB Human Interface Devices (HID) support
 =========================================
@@ -373,9 +372,7 @@ Ethernet connection between the remote (USB host) and Zephyr network support.
 * CDC EEM class, enabled with :kconfig:option:`CONFIG_USB_DEVICE_NETWORK_EEM`
 * RNDIS support, enabled with :kconfig:option:`CONFIG_USB_DEVICE_NETWORK_RNDIS`
 
-See :zephyr:code-sample:`zperf` or :zephyr:code-sample:`socket-dumb-http-server` for reference.
-Typically, users will need to add a configuration file overlay to the build,
-such as :zephyr_file:`samples/net/zperf/overlay-netusb.conf`.
+See :zephyr:code-sample:`legacy-netusb` sample for reference.
 
 Applications using RNDIS support should enable :kconfig:option:`CONFIG_USB_DEVICE_OS_DESC`
 for a better user experience on a host running Microsoft Windows OS.
@@ -389,7 +386,7 @@ The application should register descriptors such as Capability Descriptor
 using :c:func:`usb_bos_register_cap`. Registered descriptors are added to the root
 BOS descriptor and handled by the stack.
 
-See :zephyr:code-sample:`webusb` sample for reference.
+See :zephyr:code-sample:`legacy-webusb` sample for reference.
 
 Interface number and endpoint address assignment
 ************************************************

diff --git a/doc/connectivity/usb/device_next/api/index.rst b/doc/connectivity/usb/device_next/api/index.rst
@@ -1,7 +1,7 @@
 .. _usb_device_next_api:
 
-New USB device support APIs
-###########################
+USB device support APIs
+#######################
 
 .. toctree::
    :maxdepth: 1

diff --git a/doc/connectivity/usb/device_next/api/udc.rst b/doc/connectivity/usb/device_next/api/udc.rst
@@ -7,7 +7,7 @@ The USB device controller driver API is described in
 :zephyr_file:`include/zephyr/drivers/usb/udc.h` and referred to
 as the ``UDC driver`` API.
 
-UDC driver API is experimental and is subject to change without notice.
+UDC driver API is unstable and is subject to change without notice.
 It is a replacement for :ref:`usb_dc_api`. If you wish to port an existing
 driver to UDC driver API, or add a new driver, please use
 :zephyr_file:`drivers/usb/udc/udc_skeleton.c` as a starting point.

diff --git a/doc/connectivity/usb/device_next/api/usbd.rst b/doc/connectivity/usb/device_next/api/usbd.rst
@@ -1,9 +1,9 @@
 .. _usbd_api:
 
-USB device stack (next) API
-###########################
+USB device stack API
+####################
 
-New USB device stack API is experimental and is subject to change without notice.
+USB device stack API is unstable and is subject to change without notice.
 
 API reference
 *************

diff --git a/doc/connectivity/usb/device_next/usb_device.rst b/doc/connectivity/usb/device_next/usb_device.rst
@@ -1,7 +1,7 @@
 .. _usb_device_stack_next:
 
-New USB device support
-######################
+USB device support
+##################
 
 Overview
 ********
@@ -10,19 +10,16 @@ USB device support consists of the USB device controller (UDC) drivers
 , :ref:`udc_api`, and USB device stack, :ref:`usbd_api`.
 The :ref:`udc_api` provides a generic and vendor independent interface to USB
 device controllers, and although, there a is clear separation between these
-layers, the purpose of :ref:`udc_api` is to serve new Zephyr's USB device stack
+layers, the purpose of :ref:`udc_api` is to serve Zephyr's USB device stack
 exclusively.
 
-The new device stack supports multiple device controllers, meaning that if a
+The device stack supports multiple device controllers, meaning that if a
 SoC has multiple controllers, they can be used simultaneously. Full and
 high-speed device controllers are supported. It also provides support for
 registering multiple function or class instances to a configuration at runtime,
 or changing the configuration later. It has built-in support for several USB
 classes and provides an API to implement custom USB functions.
 
-The new USB device support is considered experimental and will replace
-:ref:`usb_device_stack`.
-
 Samples
 =======
 
@@ -34,13 +31,6 @@ Samples
 
 * :zephyr:code-sample:`uvc`
 
-Samples ported to new USB device support
-----------------------------------------
-
-To build a sample that supports both the old and new USB device stack, set the
-configuration ``-DCONF_FILE=usbd_next_prj.conf`` either directly or via
-``west``.
-
 * :zephyr:code-sample:`bluetooth_hci_usb`
 
 * :zephyr:code-sample:`usb-cdc-acm`
@@ -51,7 +41,7 @@ configuration ``-DCONF_FILE=usbd_next_prj.conf`` either directly or via
 
 * :zephyr:code-sample:`usb-hid-mouse`
 
-* :zephyr:code-sample:`zperf` To build the sample for the new device support,
+* :zephyr:code-sample:`zperf` To build the sample for the device support,
   set the configuration overlay file
   ``-DDEXTRA_CONF_FILE=overlay-usbd_next_ecm.conf`` and devicetree overlay file
   ``-DDTC_OVERLAY_FILE="usbd_next_ecm.overlay`` either directly or via ``west``.

diff --git a/doc/connectivity/usb/index.rst b/doc/connectivity/usb/index.rst
@@ -3,15 +3,15 @@
 USB
 ###
 
-**USB device support**
+**Legacy USB device support**
 
 .. toctree::
    :maxdepth: 1
 
    device/usb_device.rst
    device/api/index.rst
 
-**New experimental USB support**
+**USB support**
 
 .. toctree::
    :maxdepth: 1

diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
@@ -942,7 +942,7 @@ New Samples
 * :zephyr:code-sample:`bluetooth_ccp_call_control_client`
 * :zephyr:code-sample:`bluetooth_ccp_call_control_server`
 * :zephyr:code-sample:`coresight_stm_sample`
-* :zephyr:code-sample:`dfu-next`
+* :zephyr:code-sample:`usb-dfu`
 * :zephyr:code-sample:`i2c-rtio-loopback`
 * :zephyr:code-sample:`lvgl-screen-transparency`
 * :zephyr:code-sample:`mctp_endpoint_sample`
@@ -957,8 +957,8 @@ New Samples
 * :zephyr:code-sample:`tmc50xx`
 * :zephyr:code-sample:`uart`
 * :zephyr:code-sample:`usb-midi2-device`
-* :zephyr:code-sample:`usbd-cdc-acm-console`
-* :zephyr:code-sample:`webusb-next`
+* :zephyr:code-sample:`usb-cdc-acm-console`
+* :zephyr:code-sample:`webusb`
 
 Other notable changes
 *********************

diff --git a/drivers/usb/device/Kconfig b/drivers/usb/device/Kconfig
@@ -5,6 +5,7 @@
 
 menuconfig USB_DEVICE_DRIVER
 	bool "USB device controller drivers"
+	select DEPRECATED
 	help
 	  Enable USB device controller drivers.
 

diff --git a/drivers/usb/udc/Kconfig b/drivers/usb/udc/Kconfig
@@ -3,8 +3,7 @@
 
 
 menuconfig UDC_DRIVER
-	bool "USB device controller drivers [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "USB device controller drivers"
 	select NET_BUF
 	help
 	  USB device controller driver.

diff --git a/include/zephyr/drivers/uart/cdc_acm.h b/include/zephyr/drivers/uart/cdc_acm.h
@@ -34,6 +34,8 @@ typedef void (*cdc_dte_rate_callback_t)(const struct device *dev,
 /**
  * @brief Set the callback for dwDTERate SetLineCoding requests.
  *
+ * @deprecated Use @ref usbd_api and @ref USBD_MSG_CDC_ACM_LINE_CODING instead.
+ *
  * The callback is invoked when the USB host changes the baud rate.
  *
  * @note This function is available only when
@@ -44,7 +46,7 @@ typedef void (*cdc_dte_rate_callback_t)(const struct device *dev,
  *
  * @return	    0 on success.
  */
-int cdc_acm_dte_rate_callback_set(const struct device *dev,
+__deprecated int cdc_acm_dte_rate_callback_set(const struct device *dev,
 				  cdc_dte_rate_callback_t callback);
 
 #ifdef __cplusplus