diff --git a/Kconfig.adi b/Kconfig.adi
index 107cc0362400d2..f3e14a7dad47b7 100644
--- a/Kconfig.adi
+++ b/Kconfig.adi
@@ -19,9 +19,6 @@ config KERNEL_ALL_ADI_DRIVERS
 	select I2C_MUX
 	select LEDS_CLASS_FLASH
 	select PHYLIB
-	select USB
-	select USB_SUPPORT
-	select USB_SERIAL
 	select MULTIPLEXER
 	select MEDIA_SUPPORT
 	select MEDIA_CONTROLLER
@@ -36,6 +33,7 @@ config KERNEL_ALL_ADI_DRIVERS
 	select INPUT_ALL_ADI_DRIVERS
 	select MEDIA_ALL_ADI_DRIVERS
 	select SND_SOC_ALL_ADI_CODECS
+	select USB_ALL_ADI_DRIVERS
 	select POWER_RESET_LTC2952
 	select CHARGER_ADP5061
 	select I2C_MUX_LTC4306
@@ -50,6 +48,7 @@ config KERNEL_ALL_ADI_DRIVERS
 	select ADIN_T1L_PHY
 	select IPV6
 	select BRIDGE
+	select MEDIA_USB_SUPPORT
 	select NET_DSA
 	select MICROCHIP_KSZ
 	select MICROCHIP_KSZ_SPI_DRIVER
@@ -77,7 +76,6 @@ config KERNEL_ALL_ADI_DRIVERS
 	select DRM_I2C_ADV7511
 	select DRM_I2C_ADV7511_AUDIO
 	select DRM_I2C_ADV7533
-	select USB_SERIAL_UPD78F0730
 	select NVMEM_AXI_SYSID if (ARCH_ZYNQMP || ARCH_ZYNQ || MICROBLAZE || ARCH_SOCFPGA || NIOS2)
 	select INPUT_PCF8574
 	select AXI_INTR_MONITOR
@@ -88,4 +86,5 @@ source "drivers/hwmon/Kconfig.adi"
 source "drivers/iio/Kconfig.adi"
 source "drivers/input/Kconfig.adi"
 source "drivers/media/Kconfig.adi"
+source "drivers/usb/Kconfig.adi"
 source "sound/soc/codecs/Kconfig.adi"
diff --git a/drivers/media/Kconfig.adi b/drivers/media/Kconfig.adi
index d7dc67b80d18a9..132724ce9b247e 100644
--- a/drivers/media/Kconfig.adi
+++ b/drivers/media/Kconfig.adi
@@ -22,3 +22,4 @@ config MEDIA_ALL_ADI_DRIVERS
 	select VIDEO_AXI_HDMI_RX
 	select ADI_AXI_VIDEO_FRAME_BUFFER
 	select VIDEO_ADP1653
+	select USB_VIDEO_CLASS
diff --git a/drivers/usb/Kconfig.adi b/drivers/usb/Kconfig.adi
new file mode 100644
index 00000000000000..c58a665790d5bd
--- /dev/null
+++ b/drivers/usb/Kconfig.adi
@@ -0,0 +1,43 @@
+
+# This file exists solely to be include in Kconfig.adi
+
+config USB_ALL_ADI_DRIVERS
+	tristate "Build all USB drivers for the Analog Devices kernel"
+	select USB
+	select USB_SUPPORT
+	select USB_SERIAL
+	select USB_HIDDEV
+	select USB_ANNOUNCE_NEW_DEVICES
+	select USB_OTG
+	select USB_OTG_FSM
+	select USB_UAS
+	select USB_EHCI_HCD
+	select USB_STORAGE
+	select USB_MASS_STORAGE
+	select USB_CHIPIDEA
+	select USB_CHIPIDEA_UDC
+	select USB_CHIPIDEA_HOST
+	select USB_SERIAL_GENERIC
+	select USB_SERIAL_FTDI_SIO
+	select USB_ULPI
+	select USB_GADGET
+	select USB_GADGET_XILINX
+	select USB_CONFIGFS
+	select USB_CONFIGFS_SERIAL
+	select USB_CONFIGFS_ACM
+	select USB_CONFIGFS_NCM
+	select USB_CONFIGFS_ECM
+	select USB_CONFIGFS_ECM_SUBSET
+	select USB_CONFIGFS_RNDIS
+	select USB_CONFIGFS_EEM
+	select USB_CONFIGFS_MASS_STORAGE
+	select USB_CONFIGFS_F_FS
+	select USB_F_RNDIS
+	select USB_SERIAL_UPD78F0730
+	select USB_DWC2
+	select USB_DWC3
+	select USB_XHCI_HCD
+	select NOP_USB_XCEIV
+	select USB_USBNET
+	select USB_DEFAULT_PERSIST
+	select TYPEC
diff --git a/sound/soc/codecs/Kconfig.adi b/sound/soc/codecs/Kconfig.adi
index 1c3df26b3a5902..80d0ffc67dbe3a 100644
--- a/sound/soc/codecs/Kconfig.adi
+++ b/sound/soc/codecs/Kconfig.adi
@@ -35,4 +35,6 @@ config SND_SOC_ALL_ADI_CODECS
 	select SND_SOC_ADI_AXI_I2S
 	select SND_SOC_ADI_AXI_SPDIF
 	select SND_SOC_ADRV936X_BOX
+	select SND_USB
+	select SND_USB_AUDIO
 	select SND_SIMPLE_CARD