diff --git a/config/sdm670auto.conf b/config/sdm670auto.conf
new file mode 100644
index 000000000000..59e27dc313f5
--- /dev/null
+++ b/config/sdm670auto.conf
@@ -0,0 +1,46 @@
+CONFIG_PINCTRL_LPI=y
+CONFIG_PINCTRL_WCD=y
+CONFIG_AUDIO_EXT_CLK=y
+CONFIG_SND_SOC_WCD9XXX_V2=y
+CONFIG_SND_SOC_WCD_MBHC=y
+CONFIG_SND_SOC_WSA881X=y
+CONFIG_SND_SOC_WCD_DSP_MGR=y
+CONFIG_SND_SOC_WCD_SPI=y
+CONFIG_SND_SOC_WCD_CPE=y
+CONFIG_SND_SOC_WCD9335=y
+CONFIG_SND_SOC_WCD934X=y
+CONFIG_SND_SOC_WCD934X_MBHC=y
+CONFIG_SND_SOC_WCD934X_DSD=y
+CONFIG_MSM_QDSP6V2_CODECS=y
+CONFIG_MSM_ULTRASOUND=y
+CONFIG_MSM_QDSP6_APRV2_GLINK=y
+CONFIG_MSM_ADSP_LOADER=y
+CONFIG_REGMAP_SWR=y
+CONFIG_MSM_QDSP6_SSR=y
+CONFIG_MSM_QDSP6_PDR=y
+CONFIG_MSM_QDSP6_NOTIFIER=y
+CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
+CONFIG_SND_SOC_SDM670=y
+CONFIG_MSM_GLINK_SPI_XPRT=y
+CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE_WCD_CTRL=y
+CONFIG_SND_SOC_QDSP6V2=y
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
+CONFIG_WCD9XXX_CODEC_CORE=y
+CONFIG_MSM_CDC_PINCTRL=y
+CONFIG_SND_SOC_WCD_MBHC_ADC=y
+CONFIG_SND_SOC_WCD_MBHC_LEGACY=y
+CONFIG_QTI_PP=y
+CONFIG_SND_HWDEP=y
+CONFIG_DTS_EAGLE=y
+CONFIG_DOLBY_DS2=y
+CONFIG_DOLBY_LICENSE=y
+CONFIG_DTS_SRS_TM=y
+CONFIG_SND_SOC_EXT_CODEC=y
+CONFIG_SND_SOC_INT_CODEC=y
+CONFIG_SND_SOC_MSM_STUB=y
+CONFIG_WCD_DSP_GLINK=y
+CONFIG_MSM_AVTIMER=y
+CONFIG_SND_SOC_SDM660_CDC=y
+CONFIG_SND_SOC_MSM_SDW=y
diff --git a/config/sdm670autoconf.h b/config/sdm670autoconf.h
new file mode 100644
index 000000000000..7b3a3515da36
--- /dev/null
+++ b/config/sdm670autoconf.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#define CONFIG_PINCTRL_LPI 1
+#define CONFIG_PINCTRL_WCD 1
+#define CONFIG_AUDIO_EXT_CLK 1
+#define CONFIG_SND_SOC_WCD9XXX_V2 1
+#define CONFIG_SND_SOC_WCD_CPE 1
+#define CONFIG_SND_SOC_WCD_MBHC 1
+#define CONFIG_SND_SOC_WSA881X 1
+#define CONFIG_SND_SOC_WCD_DSP_MGR 1
+#define CONFIG_SND_SOC_WCD_SPI 1
+#define CONFIG_SND_SOC_WCD9335 1
+#define CONFIG_SND_SOC_WCD934X 1
+#define CONFIG_SND_SOC_WCD934X_MBHC 1
+#define CONFIG_SND_SOC_WCD934X_DSD 1
+#define CONFIG_MSM_QDSP6V2_CODECS 1
+#define CONFIG_MSM_ULTRASOUND 1
+#define CONFIG_MSM_QDSP6_APRV2_GLINK 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_REGMAP_SWR 1
+#define CONFIG_MSM_QDSP6_SSR 1
+#define CONFIG_MSM_QDSP6_PDR 1
+#define CONFIG_MSM_QDSP6_NOTIFIER 1
+#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_SND_SOC_SDM670 1
+#define CONFIG_MSM_GLINK_SPI_XPRT 1
+#define CONFIG_SOUNDWIRE 1
+#define CONFIG_SOUNDWIRE_WCD_CTRL 1
+#define CONFIG_SND_SOC_WCD_MBHC_ADC 1
+#define CONFIG_SND_SOC_WCD_MBHC_LEGACY 1
+#define CONFIG_SND_SOC_QDSP6V2 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_QTI_PP 1
+#define CONFIG_SND_HWDEP 1
+#define CONFIG_DTS_EAGLE 1
+#define CONFIG_DOLBY_DS2 1
+#define CONFIG_DOLBY_LICENSE 1
+#define CONFIG_DTS_SRS_TM 1
+#define CONFIG_WCD9XXX_CODEC_CORE 1
+#define CONFIG_MSM_CDC_PINCTRL 1
+#define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_WCD_DSP_GLINK 1
+#define CONFIG_MSM_AVTIMER 1
+#define CONFIG_SND_SOC_EXT_CODEC 1
+#define CONFIG_SND_SOC_INT_CODEC 1
+#define CONFIG_SND_SOC_SDM660_CDC 1
+#define CONFIG_SND_SOC_MSM_SDW 1
diff --git a/config/sdm845auto.conf b/config/sdm845auto.conf
index b6d4231ff275..97f2127ce606 100644
--- a/config/sdm845auto.conf
+++ b/config/sdm845auto.conf
@@ -1,5 +1,3 @@
-CONFIG_WCD934X_CODEC=y
-CONFIG_WCD9335_CODEC=y
 CONFIG_PINCTRL_WCD=y
 CONFIG_SND_SOC_WCD934X=y
 CONFIG_AUDIO_EXT_CLK=y
@@ -30,6 +28,7 @@ CONFIG_SND_SOC_QDSP6V2=y
 CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
 CONFIG_MSM_CDC_PINCTRL=y
 CONFIG_WCD9XXX_CODEC_CORE=y
+CONFIG_SND_SOC_WCD_MBHC_ADC=y
 CONFIG_QTI_PP=y
 CONFIG_SND_HWDEP=y
 CONFIG_DTS_EAGLE=y
diff --git a/config/sdm845autoconf.h b/config/sdm845autoconf.h
index 7e9de815db80..ea14533dece3 100644
--- a/config/sdm845autoconf.h
+++ b/config/sdm845autoconf.h
@@ -11,8 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#define CONFIG_WCD934X_CODEC 1
-#define CONFIG_WCD9335_CODEC 1
 #define CONFIG_PINCTRL_WCD 1
 #define CONFIG_SND_SOC_WCD934X 1
 #define CONFIG_AUDIO_EXT_CLK 1