diff --git a/Kconfig.adi b/Kconfig.adi
index 0a04b7503b828a..107cc0362400d2 100644
--- a/Kconfig.adi
+++ b/Kconfig.adi
@@ -83,3 +83,9 @@ config KERNEL_ALL_ADI_DRIVERS
 	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 "sound/soc/codecs/Kconfig.adi"
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..d7dc67b80d18a9 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"
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..1c3df26b3a5902 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