diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index afd14ccf17d4..cb2202aea41a 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -451,7 +451,6 @@ CONFIG_EDAC=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_DMADEVICES=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
 CONFIG_VHOST_VSOCK=y
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 6b144f01fbf9..a782550d28ca 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -48,6 +48,7 @@ config GKI_HIDDEN_SND_SOC_CONFIGS
 	select SND_SOC_GENERIC_DMAENGINE_PCM if (SND_SOC && SND)
 	select SND_PCM_IEC958
 	select SND_SOC_COMPRESS if (SND_SOC && SND)
+	select DMADEVICES
 	select DMA_VIRTUAL_CHANNELS
 	help
 	  Dummy config option used to enable hidden SND_SOC configs.