techpack: audio: Add guam/na/p devices to guard SND_SOC_FS16XX

* Include bathena device to build this module.
* Clean-up Makefile to avoid duplicate modules.
* Use guamauto.conf / guamautoconf.h to build.

Co-authored-by: Deivid21 <david.parra.ignacio@gmail.com>
Change-Id: Ib606ce7d4ef37a40e445eab03868a313f4ffdf2b

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

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

techpack/audio/asoc/codecs/foursemi/Kconfig

@@ -1,5 +0,0 @@
-config SND_SOC_FS16XX
-       tristate "Support foursemi fs16xx chip"
-	   depends on I2C
-	   help
-	   foursemi fs16xx driver

techpack/audio/asoc/codecs/foursemi/Makefile

@@ -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

techpack/audio/config/guamnaauto.conf

@@ -1 +0,0 @@
-CONFIG_SND_SOC_FS16XX=m

techpack/audio/config/guamnaautoconf.h

@@ -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

techpack/audio/config/guampauto.conf

@@ -1 +0,0 @@
-CONFIG_SND_SOC_FS16XX=m

techpack/audio/config/guampautoconf.h

@@ -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