diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 683c2fe00ab3..21a78ec94fcc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -474,6 +474,7 @@ config ARCH_QCOM
        select SPARSE_IRQ
        select USE_OF
        select PINCTRL
+       select SND_HWDEP
        help
          Support for Qualcomm MSM/QSD based systems.  This runs on the
          apps processor of the MSM/QSD and depends on a shared memory
diff --git a/arch/arm/configs/vendor/monaco.config b/arch/arm/configs/vendor/monaco.config
index 4cbbb2f79d3c..68a54dbad7e6 100644
--- a/arch/arm/configs/vendor/monaco.config
+++ b/arch/arm/configs/vendor/monaco.config
@@ -185,6 +185,7 @@ CONFIG_PCI_MSM=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_INTERCONNECT_TEST=y
 CONFIG_QGKI=y
+CONFIG_AUDIO_QGKI=y
 CONFIG_DEBUG_FS=y
 CONFIG_REGMAP_QTI_DEBUG=y
 CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
@@ -583,3 +584,5 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_VSOC=y
 CONFIG_ANDROID_BINDERFS=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_REGMAP_WCD_IRQ=y
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index 2649099cf7af..3e0087272c40 100644
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -54,6 +54,17 @@ config REGMAP_I3C
 	tristate
 	depends on I3C
 
+config REGMAP_WCD_IRQ
+	depends on SND_SOC
+	bool "Enable REGMAP IRQ for WCD"
+	select REGMAP_IRQ
+	default n
+	help
+	  Say 'y' here to enable REGMAP_IRQ for generic WCD IRQ.
+	  This config is intended for enabling REGMAP_IRQ for
+	  WCD IRQ. Generic WCD IRQ will be used for
+	  wcd937x and later targets.
+
 config REGMAP_QTI_DEBUG
 	bool "Regmap QTI debug feature support"
 	depends on REGMAP && DEBUG_FS && QGKI