diff --git a/Kconfig.adi b/Kconfig.adi
index 9cf176e574af7a..0c81eb50f7e415 100644
--- a/Kconfig.adi
+++ b/Kconfig.adi
@@ -63,6 +63,8 @@ config KERNEL_ALL_ADI_DRIVERS
 	imply GPIO_ADP5588_IRQ
 	imply GPIO_ADP5520
 	imply GPIO_ADI_DAQ1
+	imply EXPERT
+	imply GPIO_SYSFS
 	imply SPI_AD9250FMC
 	imply SPI_AXI_SPI_ENGINE
 	imply SPI_OFFLOAD_TRIGGER_PWM
diff --git a/arch/arm/configs/socfpga_adi_defconfig b/arch/arm/configs/socfpga_adi_defconfig
index 946a290bef3aa5..065c56893e52c3 100644
--- a/arch/arm/configs/socfpga_adi_defconfig
+++ b/arch/arm/configs/socfpga_adi_defconfig
@@ -6,7 +6,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 CONFIG_CPUSETS=y
-CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_PROFILING=y
 CONFIG_ARCH_INTEL_SOCFPGA=y
diff --git a/arch/arm/configs/zynq_xcomm_adv7511_defconfig b/arch/arm/configs/zynq_xcomm_adv7511_defconfig
index 1cd290882b714e..c72470bb83f40b 100644
--- a/arch/arm/configs/zynq_xcomm_adv7511_defconfig
+++ b/arch/arm/configs/zynq_xcomm_adv7511_defconfig
@@ -7,7 +7,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CGROUPS=y
-CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
@@ -159,10 +158,6 @@ CONFIG_HID_WALTOP=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_TWINHAN=y
 CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
 CONFIG_HID_MULTITOUCH=y
 CONFIG_HID_NTRIG=y
 CONFIG_HID_ORTEK=y
diff --git a/arch/arm64/configs/adi_versal_defconfig b/arch/arm64/configs/adi_versal_defconfig
index 26c7edbce29255..0b0061957a743f 100644
--- a/arch/arm64/configs/adi_versal_defconfig
+++ b/arch/arm64/configs/adi_versal_defconfig
@@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_CGROUPS=y
-CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_PROFILING=y
 CONFIG_ARCH_ZYNQMP=y
diff --git a/arch/arm64/configs/adi_zynqmp_defconfig b/arch/arm64/configs/adi_zynqmp_defconfig
index 7907fb435aee9d..08251ca1764d10 100644
--- a/arch/arm64/configs/adi_zynqmp_defconfig
+++ b/arch/arm64/configs/adi_zynqmp_defconfig
@@ -16,7 +16,6 @@ CONFIG_CGROUPS=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
 CONFIG_PROFILING=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_NR_CPUS=8
@@ -202,7 +201,6 @@ CONFIG_SPI_CADENCE=y
 CONFIG_SPI_XILINX=y
 CONFIG_SPI_ZYNQMP_GQSPI=y
 CONFIG_PINCTRL=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_ZYNQ=y
 CONFIG_GPIO_PCA953X=y