From 036b2dec51815c9fe2b79fb426ca64824c5ba978 Mon Sep 17 00:00:00 2001
From: Sujin Panicker <spanic@codeaurora.org>
Date: Thu, 3 Oct 2019 11:01:47 +0200
Subject: [PATCH] clover: audio: Update audio files due 8916 & 8974 platform
 convergence

---
 audio/audio_platform_info_intcodec.xml | 12 +++++++++++-
 audio/mixer_paths.xml                  | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
index c240767..aac891c 100644
--- a/audio/audio_platform_info_intcodec.xml
+++ b/audio/audio_platform_info_intcodec.xml
@@ -88,6 +88,17 @@
         <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="10004"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="10008"/>
         <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" acdb_id="10010"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="14"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" acdb_id="14"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" acdb_id="135"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" acdb_id="10"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" acdb_id="10"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" acdb_id="135"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" acdb_id="135"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>
+        <device name="SND_DEVICE_IN_HDMI_MIC" acdb_id="4"/>
+        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" acdb_id="125"/>
+        <device name="SND_DEVICE_IN_HANDSET_TMIC" acdb_id="125"/>
     </acdb_ids>
     <backend_names>
         <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
@@ -362,4 +373,3 @@
         </input_snd_device>
     </snd_devices>
 </audio_platform_info>
-
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index c7e5e4f..3580717 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -2236,6 +2236,18 @@
         <path name="unprocessed-handset-mic" />
     </path>
 
+    <path name="unprocessed-stereo-mic">
+        <path name="voice-rec-dmic-ef" />
+    </path>
+
+    <path name="unprocessed-quad-mic">
+        <path name="quad-mic" />
+    </path>
+
+    <path name="unprocessed-headset-mic">
+        <path name="headset-mic" />
+    </path>
+
     <!-- Added for ADSP testfwk -->
     <path name="ADSP testfwk">
         <ctl name="PRI_MI2S_RX_DL_HL Switch" value="1" />