diff --git a/techpack/audio/Makefile b/techpack/audio/Makefile
index e33d97cc341f..eab39d3c33eb 100644
--- a/techpack/audio/Makefile
+++ b/techpack/audio/Makefile
@@ -27,18 +27,10 @@ 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)
+ifneq (,$(filter y, $(CONFIG_BATHENA_DTB) $(CONFIG_GUAM_DTB) $(CONFIG_GUAMNA_DTB) $(CONFIG_GUAMP_DTB)))
 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     += \
@@ -83,18 +75,10 @@ ifeq ($(CONFIG_DEVON_DTB), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/devonautoconf.h
 endif
-ifeq ($(CONFIG_GUAM_DTB), y)
+ifneq (,$(filter y, $(CONFIG_BATHENA_DTB) $(CONFIG_GUAM_DTB) $(CONFIG_GUAMNA_DTB) $(CONFIG_GUAMP_DTB)))
 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/asoc/codecs/Kbuild b/techpack/audio/asoc/codecs/Kbuild
index 48e370e2ca66..7706a7bb8a90 100644
--- a/techpack/audio/asoc/codecs/Kbuild
+++ b/techpack/audio/asoc/codecs/Kbuild
@@ -252,7 +252,6 @@ ifeq ($(KERNEL_BUILD), 1)
 	obj-y	+= rouleur/
 	obj-y	+= wsa883x/
 	obj-y	+= sdm660_cdc/
-	obj-y	+= foursemi/
 endif
 # Module information used by KBuild framework
 obj-$(CONFIG_WCD9XXX_CODEC_CORE) += wcd_core_dlkm.o
@@ -306,10 +305,12 @@ aw882xx_dlkm-y := $(SND_SOC_AW882XX_OBJS)
 
 #Add fs1818 driver begain
 ifdef CONFIG_SND_SOC_FS16XX
+ifneq (,$(filter y, $(CONFIG_BATHENA_DTB) $(CONFIG_GUAM_DTB) $(CONFIG_GUAMNA_DTB) $(CONFIG_GUAMP_DTB)))
 	SND_SOC_FS16XX_OBJS += foursemi/fs16xx.o
 	SND_SOC_FS16XX_OBJS += foursemi/fs16xx_preset.o
 	SND_SOC_FS16XX_OBJS += foursemi/fs16xx_calibration.o
 endif
+endif
 obj-$(CONFIG_SND_SOC_FS16XX) += fs16xx_dlkm.o
 fs16xx_dlkm-y := $(SND_SOC_FS16XX_OBJS)
 #Add fs1818 driver end
diff --git a/techpack/audio/asoc/codecs/foursemi/Kconfig b/techpack/audio/asoc/codecs/foursemi/Kconfig
deleted file mode 100644
index 3f080886161d..000000000000
--- a/techpack/audio/asoc/codecs/foursemi/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-config SND_SOC_FS16XX
-       tristate "Support foursemi fs16xx chip"
-	   depends on I2C
-	   help
-	   foursemi fs16xx driver
\ No newline at end of file
diff --git a/techpack/audio/asoc/codecs/foursemi/Makefile b/techpack/audio/asoc/codecs/foursemi/Makefile
deleted file mode 100644
index 89f77b90b6a6..000000000000
--- a/techpack/audio/asoc/codecs/foursemi/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-###
-# Copyright (C) 2018 Fourier Semiconductor Inc. All rights reserved.
-#
-
-# FS16XX VERSION INFO, DON'T REMOVE THIS LINE!!!
-snd-soc-fs16xx-objs := fs16xx.o
-snd-soc-fs16xx-objs += fs16xx_preset.o
-snd-soc-fs16xx-objs += fs16xx_calibration.o
-obj-$(CONFIG_SND_SOC_FS16XX) += snd-soc-fs16xx.o
diff --git a/techpack/audio/config/guamnaauto.conf b/techpack/audio/config/guamnaauto.conf
deleted file mode 100644
index 26be544ad394..000000000000
--- a/techpack/audio/config/guamnaauto.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FS16XX=m
diff --git a/techpack/audio/config/guamnaautoconf.h b/techpack/audio/config/guamnaautoconf.h
deleted file mode 100644
index 1583720b2250..000000000000
--- a/techpack/audio/config/guamnaautoconf.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* 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
deleted file mode 100644
index 26be544ad394..000000000000
--- a/techpack/audio/config/guampauto.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FS16XX=m
diff --git a/techpack/audio/config/guampautoconf.h b/techpack/audio/config/guampautoconf.h
deleted file mode 100644
index 1583720b2250..000000000000
--- a/techpack/audio/config/guampautoconf.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
- */
-#define CONFIG_SND_SOC_FS16XX 1