diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index c752d6284773..1a43c5da3309 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -127,6 +127,16 @@ config GKI_HIDDEN_USB_CONFIGS
 	  If you are not building a kernel to be used for a variety of
 	  out-of-kernel build USB drivers, say N here.
 
+config GKI_HIDDEN_SOC_BUS_CONFIGS
+	bool "Hidden SoC bus configuration needed for GKI"
+	select SOC_BUS
+	  help
+	    Dummy config option used to enable SOC_BUS hidden Kconfig.
+	    The configuration is required for SoCs to register themselves to the bus.
+
+	    If you are not building a kernel to be used for a variety of SoCs and
+	    out-of-tree drivers, say N here.
+
 # Atrocities needed for
 # a) building GKI modules in separate tree, or
 # b) building drivers that are not modularizable
@@ -148,6 +158,7 @@ config GKI_HACKS_TO_FIX
 	select GKI_HIDDEN_MEDIA_CONFIGS
 	select GKI_HIDDEN_VIRTUAL_CONFIGS
 	select GKI_HIDDEN_USB_CONFIGS
+	select GKI_HIDDEN_SOC_BUS_CONFIGS
 	help
 	  Dummy config option used to enable core functionality used by
 	  modules that may not be selectable in this config.