diff --git a/techpack/audio/Makefile b/techpack/audio/Makefile
index 90faba59ca97..e33d97cc341f 100644
--- a/techpack/audio/Makefile
+++ b/techpack/audio/Makefile
@@ -27,6 +27,18 @@ ifeq ($(CONFIG_ARCH_SDM660), y)
 include $(srctree)/techpack/audio/config/sdm660auto.conf
 export $(shell sed 's/=.*//' $(srctree)/techpack/audio/config/sdm660auto.conf)
 endif
+ifeq ($(CONFIG_GUAM_DTB), y)
+include $(srctree)/techpack/audio/config/guamauto.conf
+export $(shell sed 's/=.*//' $(srctree)/techpack/audio/config/guamauto.conf)
+endif
+ifeq ($(CONFIG_GUAMNA_DTB), y)
+include $(srctree)/techpack/audio/config/guamnaauto.conf
+export $(shell sed 's/=.*//' $(srctree)/techpack/audio/config/guamnaauto.conf)
+endif
+ifeq ($(CONFIG_GUAMP_DTB), y)
+include $(srctree)/techpack/audio/config/guampauto.conf
+export $(shell sed 's/=.*//' $(srctree)/techpack/audio/config/guampauto.conf)
+endif
 
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
@@ -71,6 +83,18 @@ ifeq ($(CONFIG_DEVON_DTB), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/devonautoconf.h
 endif
+ifeq ($(CONFIG_GUAM_DTB), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/guamautoconf.h
+endif
+ifeq ($(CONFIG_GUAMNA_DTB), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/guamnaautoconf.h
+endif
+ifeq ($(CONFIG_GUAMP_DTB), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/guampautoconf.h
+endif
 ifeq ($(CONFIG_HAWAO_DTB), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/hawaoautoconf.h
diff --git a/techpack/audio/config/guamauto.conf b/techpack/audio/config/guamauto.conf
new file mode 100644
index 000000000000..26be544ad394
--- /dev/null
+++ b/techpack/audio/config/guamauto.conf
@@ -0,0 +1 @@
+CONFIG_SND_SOC_FS16XX=m
diff --git a/techpack/audio/config/guamautoconf.h b/techpack/audio/config/guamautoconf.h
new file mode 100644
index 000000000000..1583720b2250
--- /dev/null
+++ b/techpack/audio/config/guamautoconf.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ */
+#define CONFIG_SND_SOC_FS16XX 1
diff --git a/techpack/audio/config/guamnaauto.conf b/techpack/audio/config/guamnaauto.conf
new file mode 100644
index 000000000000..26be544ad394
--- /dev/null
+++ b/techpack/audio/config/guamnaauto.conf
@@ -0,0 +1 @@
+CONFIG_SND_SOC_FS16XX=m
diff --git a/techpack/audio/config/guamnaautoconf.h b/techpack/audio/config/guamnaautoconf.h
new file mode 100644
index 000000000000..1583720b2250
--- /dev/null
+++ b/techpack/audio/config/guamnaautoconf.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ */
+#define CONFIG_SND_SOC_FS16XX 1
diff --git a/techpack/audio/config/guampauto.conf b/techpack/audio/config/guampauto.conf
new file mode 100644
index 000000000000..26be544ad394
--- /dev/null
+++ b/techpack/audio/config/guampauto.conf
@@ -0,0 +1 @@
+CONFIG_SND_SOC_FS16XX=m
diff --git a/techpack/audio/config/guampautoconf.h b/techpack/audio/config/guampautoconf.h
new file mode 100644
index 000000000000..1583720b2250
--- /dev/null
+++ b/techpack/audio/config/guampautoconf.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ */
+#define CONFIG_SND_SOC_FS16XX 1