diff --git a/asoc/codecs/wcd_cpe_core.h b/asoc/codecs/wcd_cpe_core.h
index 5884a528541f..269c5f2a5b00 100644
--- a/asoc/codecs/wcd_cpe_core.h
+++ b/asoc/codecs/wcd_cpe_core.h
@@ -222,8 +222,22 @@ struct wcd_cpe_params {
 	struct cpe_svc_init_param *cpe_svc_params;
 };
 
+#if IS_ENABLED(CONFIG_SND_SOC_WCD_CPE)
 int wcd_cpe_ssr_event(void *core_handle,
 		      enum wcd_cpe_ssr_state_event event);
 struct wcd_cpe_core *wcd_cpe_init(const char *img_fname,
 struct snd_soc_codec *codec, struct wcd_cpe_params *params);
+#else /* CONFIG_SND_SOC_WCD_CPE */
+static inline int wcd_cpe_ssr_event(void *core_handle,
+		      enum wcd_cpe_ssr_state_event event)
+{
+	return 0;
+}
+static inline struct wcd_cpe_core *wcd_cpe_init(const char *img_fname,
+						struct snd_soc_codec *codec,
+						struct wcd_cpe_params *params)
+{
+	return NULL;
+}
+#endif /* CONFIG_SND_SOC_WCD_CPE */
 #endif
diff --git a/config/qcs405auto.conf b/config/qcs405auto.conf
index 127311dbb441..ddd9741304b6 100644
--- a/config/qcs405auto.conf
+++ b/config/qcs405auto.conf
@@ -25,7 +25,6 @@ CONFIG_VA_MACRO=m
 CONFIG_MSM_GLINK_SPI_XPRT=m
 CONFIG_WCD_DSP_GLINK=m
 CONFIG_SOUNDWIRE=m
-CONFIG_WCD9XXX_CODEC_CORE=m
 CONFIG_SND_SOC_QDSP6V2=m
 CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
 CONFIG_QTI_PP=m
diff --git a/config/qcs405autoconf.h b/config/qcs405autoconf.h
index 0bb0463032c5..066f2909108b 100644
--- a/config/qcs405autoconf.h
+++ b/config/qcs405autoconf.h
@@ -16,7 +16,6 @@
 #define CONFIG_SND_SOC_WCD9XXX_V2 1
 #define CONFIG_SND_SOC_WSA881X 1
 #define CONFIG_SND_SOC_WCD_DSP_MGR 1
-#define CONFIG_SND_SOC_WCD_CPE 1
 #define CONFIG_SND_SOC_WCD9335 1
 #define CONFIG_WCD9XXX_CODEC_CORE 1
 #define CONFIG_MSM_CDC_PINCTRL 1