usb: cdc_acm: configure CDC ACM UART instances using devicetree only

Remove the possibility to configure number of CDC ACM UART
instances in Kconfig.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

subsys/usb/class/Kconfig.cdc

@@ -5,23 +5,16 @@ DT_COMPAT_ZEPHYR_CDC_ACM_UART := zephyr,cdc-acm-uart
 
 menu "USB CDC ACM Class support"
 
-config USB_CDC_ACM_HAS_DT_COMPAT
-	bool
-	default $(dt_compat_enabled,$(DT_COMPAT_ZEPHYR_CDC_ACM_UART))
-	imply USB_CDC_ACM
-	help
-	  Helper symbol to select USB_CDC_ACM if compatible node is enabled.
-
 config USB_CDC_ACM
 	bool "USB CDC ACM Class support"
 	depends on SERIAL
+	default $(dt_compat_enabled,$(DT_COMPAT_ZEPHYR_CDC_ACM_UART))
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	select RING_BUFFER
 	select UART_INTERRUPT_DRIVEN
 	help
 	  USB CDC ACM class support.
-	  Default UART device name is "CDC_ACM_0".
 
 if USB_CDC_ACM
 
@@ -31,19 +24,6 @@ config USB_CDC_ACM_RINGBUF_SIZE
 	help
 	  USB CDC ACM ring buffer size
 
-config USB_CDC_ACM_DEVICE_NAME
-	string "USB CDC ACM device name template"
-	default "CDC_ACM"
-	help
-	  Device name template for the CDC ACM Devices. First device would
-	  have name $(USB_CDC_ACM_DEVICE_NAME)_0, etc.
-
-if !USB_CDC_ACM_HAS_DT_COMPAT
-module = USB_CDC_ACM
-default-count = 1
-source "subsys/usb/class/Kconfig.template.composite_device_number"
-endif
-
 config CDC_ACM_INTERRUPT_EP_MPS
 	int
 	default 16

subsys/usb/class/cdc_acm.c

@@ -1088,19 +1088,6 @@ static const struct uart_driver_api cdc_acm_driver_api = {
 		.tx_ringbuf = &tx_ringbuf_##x,				\
 	};
 
-#define CDC_ACM_DEVICE_DEFINE(idx, _)					\
-	CDC_ACM_CFG_AND_DATA_DEFINE(idx)				\
-									\
-	DEVICE_DEFINE(cdc_acm_##idx,					\
-		CONFIG_USB_CDC_ACM_DEVICE_NAME "_" #idx,		\
-		cdc_acm_init, NULL,					\
-		&cdc_acm_dev_data_##idx,				\
-		&cdc_acm_config_##idx,					\
-		POST_KERNEL,						\
-		CONFIG_KERNEL_INIT_PRIORITY_DEVICE,			\
-		&cdc_acm_driver_api);
-
-
 #define DT_DRV_COMPAT zephyr_cdc_acm_uart
 
 #define CDC_ACM_DT_DEVICE_DEFINE(idx)					\
@@ -1114,8 +1101,4 @@ static const struct uart_driver_api cdc_acm_driver_api = {
 		POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,	\
 		&cdc_acm_driver_api);
 
-#if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
 DT_INST_FOREACH_STATUS_OKAY(CDC_ACM_DT_DEVICE_DEFINE);
-#else
-UTIL_LISTIFY(CONFIG_USB_CDC_ACM_DEVICE_COUNT, CDC_ACM_DEVICE_DEFINE, _)
-#endif