From abd971f747c93a9fcae77579d90ae54933a2f55b Mon Sep 17 00:00:00 2001
From: Rafael Ristovski <rafael.ristovski@gmail.com>
Date: Sun, 19 Nov 2023 00:51:10 +0100
Subject: [PATCH] techpack/audio: config: Sync config file and header

---
 techpack/audio/config/lahainaauto.conf  | 3 ++-
 techpack/audio/config/lahainaautoconf.h | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/techpack/audio/config/lahainaauto.conf b/techpack/audio/config/lahainaauto.conf
index d25da701b..cf3350659 100644
--- a/techpack/audio/config/lahainaauto.conf
+++ b/techpack/audio/config/lahainaauto.conf
@@ -7,13 +7,13 @@ export CONFIG_WCD9XXX_CODEC_CORE_V2=y
 export CONFIG_MSM_CDC_PINCTRL=y
 export CONFIG_MSM_QDSP6V2_CODECS=y
 export CONFIG_MSM_QDSP6_APRV2_RPMSG=y
+export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
 export CONFIG_MSM_ADSP_LOADER=y
 export CONFIG_REGMAP_SWR=y
 export CONFIG_MSM_QDSP6_SSR=y
 export CONFIG_MSM_QDSP6_PDR=y
 export CONFIG_MSM_QDSP6_NOTIFIER=y
 export CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y
-export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
 export CONFIG_SOUNDWIRE=y
 export CONFIG_SOUNDWIRE_MSTR_CTRL=y
 export CONFIG_SND_SOC_QDSP6V2=y
@@ -44,6 +44,7 @@ export CONFIG_SND_SWR_HAPTICS=y
 export CONFIG_DIGITAL_CDC_RSC_MGR=y
 export CONFIG_SND_SOC_TFA9874=y
 export CONFIG_AUXPCM_DISABLE=y
+export CONFIG_SWRM_VER_1P6=y
 export CONFIG_MIUS_IIO=y
 export CONFIG_SND_SOC_AW88263S=y
 export CONFIG_SND_SOC_AW88263S_M20=y
diff --git a/techpack/audio/config/lahainaautoconf.h b/techpack/audio/config/lahainaautoconf.h
index 2f845b48b..ca0602220 100644
--- a/techpack/audio/config/lahainaautoconf.h
+++ b/techpack/audio/config/lahainaautoconf.h
@@ -20,9 +20,9 @@
 #define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
 #define CONFIG_SOUNDWIRE 1
 #define CONFIG_SOUNDWIRE_MSTR_CTRL 1
+#define CONFIG_SND_SOC_QDSP6V2 1
 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1
 #define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
-#define CONFIG_SND_SOC_QDSP6V2 1
 #define CONFIG_QTI_PP 1
 #define CONFIG_SND_HWDEP_ROUTING 1
 #define CONFIG_SND_SOC_MSM_STUB 1
@@ -33,7 +33,6 @@
 #define CONFIG_TX_MACRO 1
 #define CONFIG_SND_SOC_WCD_IRQ 1
 #define CONFIG_SND_SOC_WCD938X 1
-#define CONFIG_SND_SOC_WCD937X 1
 #define CONFIG_SND_SOC_WCD938X_SLAVE 1
 #define CONFIG_SND_SOC_WCD937X 1
 #define CONFIG_SND_SOC_WCD937X_SLAVE 1
@@ -47,7 +46,7 @@
 #define CONFIG_MSM_CSPL 1
 #define CONFIG_SND_SWR_HAPTICS 1
 #define CONFIG_DIGITAL_CDC_RSC_MGR 1
-//#define CONFIG_SND_SOC_TFA9874 1
+#define CONFIG_SND_SOC_TFA9874 1
 #define CONFIG_AUXPCM_DISABLE 1
 #define CONFIG_SWRM_VER_1P6 1
 #define CONFIG_MIUS_IIO 1