diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 3737cb13432e..63f56b40429d 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -281,7 +281,8 @@ CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_USB is not set
+CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_SOC=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index ba4480dede94..8b80d17c9e8f 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -4,7 +4,6 @@ config GKI_HIDDEN_DRM_CONFIGS
 	select DRM_GEM_CMA_HELPER
 	select DRM_KMS_CMA_HELPER
 	select DRM_MIPI_DSI
-	select SND_PCM_ELD
 	select VIDEOMODE_HELPERS
 	select WANT_DEV_COREDUMP
 	help
@@ -32,6 +31,9 @@ config GKI_HIDDEN_CRYPTO_CONFIGS
 config GKI_HIDDEN_SND_CONFIGS
 	bool "Hidden SND configs needed for GKI"
 	select SND_VMASTER
+	select SND_PCM_ELD
+	select SND_JACK
+	select SND_JACK_INPUT_DEV
 	help
 	  Dummy config option used to enable hidden SND configs.
 	  These are normally selected implicitly when a module