diff --git a/Kconfig.adi b/Kconfig.adi
index 0a04b7503b828a..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,9 +76,15 @@ 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
 	select FB_TFT_SEPS525
 	select LEDS_AS3645A
+
+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/arch/arm/configs/socfpga_adi_defconfig b/arch/arm/configs/socfpga_adi_defconfig
index 530c5f311af0fd..04b44ba3ffe5c0 100644
--- a/arch/arm/configs/socfpga_adi_defconfig
+++ b/arch/arm/configs/socfpga_adi_defconfig
@@ -111,11 +111,6 @@ CONFIG_MFD_STMPE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB_ALTERA_VIP=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_DWC2=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
diff --git a/arch/arm/configs/zynq_xcomm_adv7511_defconfig b/arch/arm/configs/zynq_xcomm_adv7511_defconfig
index 0bef5134603aa7..a678e7c945b8fd 100644
--- a/arch/arm/configs/zynq_xcomm_adv7511_defconfig
+++ b/arch/arm/configs/zynq_xcomm_adv7511_defconfig
@@ -145,8 +145,6 @@ CONFIG_XILINX_WATCHDOG=y
 CONFIG_CADENCE_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
 CONFIG_USB_GSPCA=y
 CONFIG_VIDEO_IMAGEON_BRIDGE=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
@@ -157,7 +155,6 @@ CONFIG_LOGO=y
 # CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_ARM is not set
 # CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
 CONFIG_HIDRAW=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
@@ -212,22 +209,7 @@ CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_OTG=y
-CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_XILINX=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
diff --git a/arch/arm64/configs/adi_zynqmp_defconfig b/arch/arm64/configs/adi_zynqmp_defconfig
index fa802bfe92a02a..e0cee42dcc1856 100644
--- a/arch/arm64/configs/adi_zynqmp_defconfig
+++ b/arch/arm64/configs/adi_zynqmp_defconfig
@@ -189,7 +189,6 @@ CONFIG_SMSC_PHY=y
 CONFIG_STE10XP=y
 CONFIG_VITESSE_PHY=y
 CONFIG_XILINX_GMII2RGMII=y
-CONFIG_USB_USBNET=y
 CONFIG_WL18XX=y
 CONFIG_WLCORE_SPI=y
 CONFIG_WLCORE_SDIO=y
@@ -233,8 +232,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_TPS65086=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
 CONFIG_VIDEO_XILINX=y
 CONFIG_VIDEO_XILINX_AXI4S_SWITCH=y
 CONFIG_VIDEO_XILINX_CFA=y
@@ -273,28 +270,12 @@ CONFIG_FB_XILINX=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_PCI is not set
-CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC_XILINX_DP=y
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=y
 CONFIG_SND_SOC_XILINX_SDI=y
 CONFIG_SND_SOC_XILINX_I2S=y
 CONFIG_SND_SOC_XILINX_SPDIF=y
 CONFIG_SND_SOC_XILINX_PL_SND_CARD=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_DEFAULT_PERSIST is not set
-CONFIG_USB_OTG=y
-CONFIG_USB_OTG_FSM=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_UAS=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_XILINX=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_EEM=y
 CONFIG_USB_MASS_STORAGE=m
@@ -346,7 +327,6 @@ CONFIG_ZYNQMP_R5_REMOTEPROC=m
 CONFIG_XILINX_VCU=m
 CONFIG_XILINX_AMS=y
 CONFIG_XILINX_INTC=y
-CONFIG_RESET_CONTROLLER=y
 CONFIG_RAS=y
 CONFIG_ANDROID=y
 CONFIG_NVMEM_ZYNQMP=y
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 178a4d61fe8447..870a13cca77b9a 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -24,8 +24,6 @@ menuconfig HWMON
 
 if HWMON
 
-source "drivers/hwmon/Kconfig.adi"
-
 config HWMON_VID
 	tristate
 
diff --git a/drivers/hwmon/Kconfig.adi b/drivers/hwmon/Kconfig.adi
index c539b5224af439..07e805cbf2611b 100644
--- a/drivers/hwmon/Kconfig.adi
+++ b/drivers/hwmon/Kconfig.adi
@@ -1,5 +1,5 @@
 
-# This file exists solely to be include in drivers/hwmon/Kconfig
+# This file exists solely to be include in Kconfig.adi
 
 config HWMON_ALL_ADI_DRIVERS
 	tristate "Build all Analog Devices HWMON Drivers"
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 216d52aeaafd87..fb0802667321ac 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -12,9 +12,6 @@ menuconfig IIO
 
 if IIO
 
-# Not upstream
-source "drivers/iio/Kconfig.adi"
-
 config IIO_BUFFER
 	bool "Enable buffer support within IIO"
 	help
diff --git a/drivers/iio/Kconfig.adi b/drivers/iio/Kconfig.adi
index 59df1cd19b7e7d..f0ed3cf7055c26 100644
--- a/drivers/iio/Kconfig.adi
+++ b/drivers/iio/Kconfig.adi
@@ -1,5 +1,5 @@
 
-# This file exists solely to be include in drivers/iio/Kconfig
+# This file exists solely to be include in Kconfig.adi
 # It's a bit of hurry-ed-up job; many symbols need to be depended
 # on I2C or SPI, but that can be done later; the ADI image has
 # these symbols enabled anyway
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index f520a89568c2bd..c5992cd195a118 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -25,8 +25,6 @@ config INPUT
 
 if INPUT
 
-source "drivers/input/Kconfig.adi"
-
 config INPUT_LEDS
 	tristate "Export input device LEDs in sysfs"
 	depends on LEDS_CLASS
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 2f01e95f4fa333..8add62a18293ef 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -26,8 +26,6 @@ if MEDIA_SUPPORT
 
 comment "Multimedia core support"
 
-source "drivers/media/Kconfig.adi"
-
 #
 # Multimedia support - automatically enable V4L2 and DVB core
 #
diff --git a/drivers/media/Kconfig.adi b/drivers/media/Kconfig.adi
index af7a16a41c9b73..132724ce9b247e 100644
--- a/drivers/media/Kconfig.adi
+++ b/drivers/media/Kconfig.adi
@@ -1,5 +1,5 @@
 
-# This file exists solely to be include in drivers/media/Kconfig
+# This file exists solely to be include in Kconfig.adi
 
 config MEDIA_ALL_ADI_DRIVERS
 	tristate "Build all Analog Devices Media Drivers"
@@ -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 b/sound/soc/codecs/Kconfig
index a64fcd404b800e..52606d882b4ad0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -10,9 +10,6 @@ config SND_SOC_I2C_AND_SPI
 
 menu "CODEC drivers"
 
-# Not upstream
-source "sound/soc/codecs/Kconfig.adi"
-
 config SND_SOC_ALL_CODECS
 	tristate "Build all ASoC CODEC drivers"
 	depends on COMPILE_TEST
diff --git a/sound/soc/codecs/Kconfig.adi b/sound/soc/codecs/Kconfig.adi
index 3f5e5a8e4d95d3..80d0ffc67dbe3a 100644
--- a/sound/soc/codecs/Kconfig.adi
+++ b/sound/soc/codecs/Kconfig.adi
@@ -1,5 +1,5 @@
 
-# This file exists solely to be include in sound/soc/codecs/Kconfig
+# This file exists solely to be include in Kconfig.adi
 # Unfortunately, this is the best approach to build all ADI codecs
 # in a single change, since all that's needed is to select the
 # 'SND_SOC_ALL_ADI_CODECS' symbol and all should work
@@ -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