From 6105436630867c40870bec5392669ced78090521 Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Tue, 18 Sep 2018 11:37:43 +0800
Subject: audio: b4s4: audio table update on XML and ACDB

1. modified handset-mic for handset mode (short-term)
2. modified "headphones" path sequence for headphone volume
3. Add sidetone and operator tuning
4. make voice recording and camcorder to use correct path
5. enable waves module in CIRRUS_FEEDFORWORD_STEREO, for speaker playback tuning
6. tuning voice recording on mono and stereo
7. tuning speaker mode TX/RX on WB
8. tuning handset mode TX/RX on VoIP

Test: local build
Bug: 115851632
Bug: 115859147
Bug: 115861161
Change-Id: I33975825260ad47de86a0c749579bea923914b94
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
---
 audio_platform_info_intcodec_s4.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'audio_platform_info_intcodec_s4.xml')

diff --git a/audio_platform_info_intcodec_s4.xml b/audio_platform_info_intcodec_s4.xml
index 450f73c7..5b1c5e33 100644
--- a/audio_platform_info_intcodec_s4.xml
+++ b/audio_platform_info_intcodec_s4.xml
@@ -39,6 +39,8 @@
         <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>
         <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="41"/>
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" acdb_id="34"/>
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="61"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="7"/>
         <device name="SND_DEVICE_IN_VOICE_DMIC" acdb_id="41"/>
         <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" acdb_id="10"/>
@@ -50,6 +52,14 @@
         <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="8"/>
         <device name="SND_DEVICE_IN_VOICE_DMIC_TMUS" acdb_id="99"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="98"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" acdb_id="111"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" acdb_id="117"/>
+        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" acdb_id="8"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" acdb_id="10"/>
+        <device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" acdb_id="77"/>
+        <device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="77"/>
+        <device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" acdb_id="78"/>
+        <device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" acdb_id="78"/>
 
         <!-- TTY -->
         <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" acdb_id="14"/>
@@ -93,8 +103,21 @@
     <config_params>
         <param key="input_mic_max_count" value="3"/>
         <param key="snd_card_name" value="sdm670-intcodec-s4-snd-card"/>
+        <param key="operator_info" value="tmus;310260"/>
+        <param key="operator_info" value="att;310410"/>
     </config_params>
 
+    <operator_specific>
+        <device name="SND_DEVICE_IN_VOICE_DMIC" operator="att" mixer_path="voice-dmic-ef-att" acdb_id="79"/>
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" operator="att" mixer_path="voice-handset-att" acdb_id="80"/>
+        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" operator="tmus" mixer_path="voice-headset-mic-tmus" acdb_id="55"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" operator="tmus" mixer_path="voice-headphones-tmus" acdb_id="66"/>
+        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" operator="att" mixer_path="voice-headset-mic-att" acdb_id="94"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" operator="att" mixer_path="voice-headphones-att" acdb_id="53"/>
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" operator="att" mixer_path="voice-speaker-dmic-ef-att" acdb_id="81"/>
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" operator="att" mixer_path="voice-speaker-att" acdb_id="82"/>
+    </operator_specific>
+
     <gain_db_to_level_mapping>
         <gain_level_map db="-59" level="5"/>
         <gain_level_map db="-17.4" level="4"/>
@@ -121,6 +144,9 @@
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SEC_TDM_RX_0-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" backend="speaker" interface="SEC_TDM_RX-and-HDMI_RX"/>
         <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="SEC_TDM_RX_0"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC" backend="handset" interface="PRI_TDM_TX_0"/>
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" backend="handset" interface="PRI_TDM_TX_0"/>
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" backend="handset" interface="PRI_TDM_TX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="SEC_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset" interface="SEC_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="SEC_TDM_RX_0"/>
@@ -142,6 +168,7 @@
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES" backend="speaker-and-headphones" interface="SEC_TDM_RX_0-and-INT0_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE" backend="speaker-and-headphones" interface="SEC_TDM_RX_0-and-INT0_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="INT0_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="INT0_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
@@ -149,6 +176,8 @@
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP" backend="speaker-and-bt-a2dp" interface="SEC_TDM_RX_0-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="INT3_MI2S_TX"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
         <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
         <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
         <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
-- 
cgit v1.2.3