From 4ec279c7cb257fe7d1a43ab5eda51bf41e6852dd Mon Sep 17 00:00:00 2001
From: Shuai Zhang <quic_shuzhan@quicinc.com>
Date: Fri, 4 Mar 2022 12:13:26 +0530
Subject: [PATCH] makefile: add config support for audio techpack for QCS610

Add required changes to makefile and enable the config
keys for QCS610 target cpmpilation.

Change-Id: I8ef55e9b237f10ae0d240d83c685f5580a939be3
Signed-off-by: Shuai Zhang <quic_shuzhan@quicinc.com>
---
 Makefile               |  8 +++-
 config/sm6150auto.conf | 96 +++++++++++++++++++++---------------------
 2 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index d60a0236f5ee..73ad150b67ec 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,9 @@ endif
 ifeq ($(CONFIG_ARCH_SA6155), y)
 include $(srctree)/techpack/audio/config/sa6155auto.conf
 endif
+ifeq ($(CONFIG_ARCH_SM6150), y)
+include $(srctree)/techpack/audio/config/sm6150auto.conf
+endif
 endif
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
@@ -79,7 +82,10 @@ ifeq ($(CONFIG_ARCH_SA6155), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sa6155autoconf.h
 endif
-
+ifeq ($(CONFIG_ARCH_SM6150), y)
+LINUXINCLUDE    += \
+                -include $(srctree)/techpack/audio/config/sm6150autoconf.h
+endif
 obj-y += soc/
 obj-y += dsp/
 obj-y += ipc/
diff --git a/config/sm6150auto.conf b/config/sm6150auto.conf
index f6074abbac0b..8ebc88a5e7de 100644
--- a/config/sm6150auto.conf
+++ b/config/sm6150auto.conf
@@ -1,48 +1,48 @@
-CONFIG_PINCTRL_WCD=m
-CONFIG_PINCTRL_LPI=m
-CONFIG_AUDIO_EXT_CLK=m
-CONFIG_SND_SOC_WCD9XXX_V2=m
-CONFIG_SND_SOC_WCD_MBHC=m
-CONFIG_SND_SOC_WSA881X=m
-CONFIG_SND_SOC_WCD_DSP_MGR=m
-CONFIG_SND_SOC_WCD_SPI=m
-CONFIG_SND_SOC_WCD934X=m
-CONFIG_SND_SOC_WCD934X_MBHC=m
-CONFIG_SND_SOC_WCD934X_DSD=m
-CONFIG_WCD9XXX_CODEC_CORE=m
-CONFIG_MSM_CDC_PINCTRL=m
-CONFIG_MSM_QDSP6V2_CODECS=m
-CONFIG_MSM_ULTRASOUND=m
-CONFIG_MSM_QDSP6_APRV2_RPMSG=m
-CONFIG_MSM_ADSP_LOADER=m
-CONFIG_REGMAP_SWR=m
-CONFIG_MSM_QDSP6_SSR=m
-CONFIG_MSM_QDSP6_PDR=m
-CONFIG_MSM_QDSP6_NOTIFIER=m
-CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m
-CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
-CONFIG_SND_SOC_SM6150=m
-CONFIG_MSM_GLINK_SPI_XPRT=m
-CONFIG_WCD_DSP_GLINK=m
-CONFIG_SOUNDWIRE=m
-CONFIG_SOUNDWIRE_MSTR_CTRL=m
-CONFIG_SND_SOC_QDSP6V2=m
-CONFIG_SND_SOC_WCD_MBHC_ADC=m
-CONFIG_QTI_PP=m
-CONFIG_SND_HWDEP_ROUTING=m
-CONFIG_DTS_EAGLE=m
-CONFIG_DOLBY_DS2=m
-CONFIG_DOLBY_LICENSE=m
-CONFIG_DTS_SRS_TM=m
-CONFIG_SND_SOC_MSM_STUB=m
-CONFIG_MSM_AVTIMER=m
-CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
-CONFIG_SND_SOC_BOLERO=m
-CONFIG_WSA_MACRO=m
-CONFIG_VA_MACRO=m
-CONFIG_RX_MACRO=m
-CONFIG_TX_MACRO=m
-CONFIG_SND_SOC_WCD_IRQ=m
-CONFIG_SND_SOC_WCD937X=m
-CONFIG_SND_SOC_WCD937X_SLAVE=m
-CONFIG_SND_EVENT=m
+export  CONFIG_PINCTRL_WCD=m
+export  CONFIG_PINCTRL_LPI=m
+export  CONFIG_AUDIO_EXT_CLK=m
+export  CONFIG_SND_SOC_WCD9XXX_V2=m
+export  CONFIG_SND_SOC_WCD_MBHC=m
+export  CONFIG_SND_SOC_WSA881X=m
+export  CONFIG_SND_SOC_WCD_DSP_MGR=m
+export  CONFIG_SND_SOC_WCD_SPI=m
+export  CONFIG_SND_SOC_WCD934X=m
+export  CONFIG_SND_SOC_WCD934X_MBHC=m
+export  CONFIG_SND_SOC_WCD934X_DSD=m
+export  CONFIG_WCD9XXX_CODEC_CORE=m
+export  CONFIG_MSM_CDC_PINCTRL=m
+export  CONFIG_MSM_QDSP6V2_CODECS=m
+export  CONFIG_MSM_ULTRASOUND=m
+export  CONFIG_MSM_QDSP6_APRV2_RPMSG=m
+export  CONFIG_MSM_ADSP_LOADER=m
+export  CONFIG_REGMAP_SWR=m
+export  CONFIG_MSM_QDSP6_SSR=m
+export  CONFIG_MSM_QDSP6_PDR=m
+export  CONFIG_MSM_QDSP6_NOTIFIER=m
+export  CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m
+export  CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+export  CONFIG_SND_SOC_SM6150=m
+export  CONFIG_MSM_GLINK_SPI_XPRT=m
+export  CONFIG_WCD_DSP_GLINK=m
+export  CONFIG_SOUNDWIRE=m
+export  CONFIG_SOUNDWIRE_MSTR_CTRL=m
+export  CONFIG_SND_SOC_QDSP6V2=m
+export  CONFIG_SND_SOC_WCD_MBHC_ADC=m
+export  CONFIG_QTI_PP=m
+export  CONFIG_SND_HWDEP_ROUTING=m
+export  CONFIG_DTS_EAGLE=m
+export  CONFIG_DOLBY_DS2=m
+export  CONFIG_DOLBY_LICENSE=m
+export  CONFIG_DTS_SRS_TM=m
+export  CONFIG_SND_SOC_MSM_STUB=m
+export  CONFIG_MSM_AVTIMER=m
+export  CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export  CONFIG_SND_SOC_BOLERO=m
+export  CONFIG_WSA_MACRO=m
+export  CONFIG_VA_MACRO=m
+export  CONFIG_RX_MACRO=m
+export  CONFIG_TX_MACRO=m
+export  CONFIG_SND_SOC_WCD_IRQ=m
+export  CONFIG_SND_SOC_WCD937X=m
+export  CONFIG_SND_SOC_WCD937X_SLAVE=m
+export  CONFIG_SND_EVENT=m