diff --git a/Makefile b/Makefile
index ff83693730d3..de65a18f0478 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,10 @@ ifeq ($(CONFIG_ARCH_SDM670), y)
 include $(srctree)/techpack/audio/config/sdm670auto.conf
 export
 endif
+ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
+include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
+export
+endif
 
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
@@ -26,7 +30,10 @@ ifeq ($(CONFIG_ARCH_SDM670), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdm670autoconf.h
 endif
-
+ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h
+endif
 
 obj-y += asoc/
 obj-y += dsp/
diff --git a/config/sdxpoorwillsauto.conf b/config/sdxpoorwillsauto.conf
new file mode 100644
index 000000000000..d9dd081e876a
--- /dev/null
+++ b/config/sdxpoorwillsauto.conf
@@ -0,0 +1,29 @@
+CONFIG_PINCTRL_WCD=y
+CONFIG_SND_SOC_WCD934X=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_WCD934X=y
+CONFIG_SND_SOC_WCD934X_MBHC=y
+CONFIG_SND_SOC_WCD934X_DSD=y
+CONFIG_MSM_QDSP6V2_CODECS=y
+CONFIG_MSM_QDSP6_APRV3_GLINK=y
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
+CONFIG_MSM_ADSP_LOADER=y
+CONFIG_REGMAP_SWR=y
+CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
+CONFIG_SND_SOC_POORWILLS=y
+CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE_WCD_CTRL=y
+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_SND_SOC_MACHINE_SDXPOORWILLS=y
+CONFIG_SND_SOC_MSM_STUB=y
diff --git a/config/sdxpoorwillsautoconf.h b/config/sdxpoorwillsautoconf.h
new file mode 100644
index 000000000000..9fc6258fe1b3
--- /dev/null
+++ b/config/sdxpoorwillsautoconf.h
@@ -0,0 +1,42 @@
+/*
+ * 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_WCD 1
+#define CONFIG_SND_SOC_WCD934X 1
+#define CONFIG_AUDIO_EXT_CLK 1
+#define CONFIG_SND_SOC_WCD9XXX_V2 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_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_QDSP6_APRV3_GLINK 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_REGMAP_SWR 1
+#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_SND_SOC_POORWILLS 1
+#define CONFIG_SOUNDWIRE 1
+#define CONFIG_SOUNDWIRE_WCD_CTRL 1
+#define CONFIG_SND_SOC_QDSP6V2 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_MSM_CDC_PINCTRL 1
+#define CONFIG_WCD9XXX_CODEC_CORE 1
+#define CONFIG_SND_SOC_WCD_MBHC_ADC 1
+#define CONFIG_QTI_PP 1
+#define CONFIG_SND_HWDEP 1
+#define CONFIG_SND_SOC_MACHINE_SDXPOORWILLS 1
+#define CONFIG_SND_SOC_MSM_STUB 1