From e490d1eb4bc015b3e937f531b6be1d30257eeef8 Mon Sep 17 00:00:00 2001
From: "taeho.youn" <taeho.youn@lge.com>
Date: Sat, 17 Jun 2017 21:32:33 +0900
Subject: [PATCH] audio: Update configuration for VoIP

- VOIP mixer Tx gain
- set app type for VoIP
- set acdb_id for VoIP speaker
- set echo reference for VoIP speaker

Bug: 62826294
Test: audio sanity test
Change-Id: I8c05d666d3b4fe8719419d3dde7954e91201397b
---
 audio_platform_info_tavil.xml |  4 ++++
 mixer_paths_tavil.xml         | 27 ++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index b065b26..a0247e8 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -35,6 +35,8 @@
         <device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" acdb_id="47"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="48"/>
         <device name="SND_DEVICE_IN_VOICE_RECOG_USB_HEADSET_MIC" acdb_id="49"/>
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="129"/>
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" acdb_id="126"/>
     </acdb_ids>
     <bit_width_configs>
         <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -84,8 +86,10 @@
     <app_types>
       <app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" />
       <app uc_type="PCM_PLAYBACK" mode="default" bit_width="24" id="69940" max_rate="192000" />
+      <app uc_type="PCM_PLAYBACK" mode="voip" bit_width="16" id="69945" max_rate="48000" />
       <app uc_type="PCM_CAPTURE"  mode="default" bit_width="16" id="69938" max_rate="96000" />
       <app uc_type="PCM_CAPTURE"  mode="default" bit_width="24" id="69940" max_rate="96000" />
+      <app uc_type="PCM_CAPTURE"  mode="voip" bit_width="16" id="69945" max_rate="48000" />
     </app_types>
 </audio_platform_info>
 
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index a4a5ba4..090fe20 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -604,26 +604,42 @@
     <!-- ADSP testfwk end-->
     <!-- TI SPK Configuration -->
     <ctl name="Stereo Configuration" value="0" />
+    <ctl name="Stereo EchoRef Ctrl" value="left channel" />
 
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
 
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="echo-reference">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
+        <ctl name="Stereo EchoRef Ctrl" value="left channel" />
     </path>
 
     <path name="echo-reference speaker">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
+        <ctl name="Stereo EchoRef Ctrl" value="right channel" />
     </path>
 
     <path name="echo-reference handset">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
+        <ctl name="Stereo EchoRef Ctrl" value="left channel" />
     </path>
 
     <path name="echo-reference headphones">
         <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
     </path>
 
+    <path name="echo-reference usb-headset">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+    </path>
+
+    <path name="echo-reference bt-sco">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+    </path>
+
+    <path name="echo-reference bt-sco-wb">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+    </path>
+
     <path name="deep-buffer-playback">
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
     </path>
@@ -1451,6 +1467,7 @@
     <!-- Phone SPK RX -->
     <path name="voice-speaker">
         <path name="speaker-mono" />
+        <ctl name="QUAT_MI2S_RX Channels" value="One" />
     </path>
 
     <!-- Phone SPK RX -->
@@ -1493,9 +1510,9 @@
     <!-- Phone SPK TX 3rd:DEC5 4dB, 2nd:DEC6 4dB, 1st:DEC7 4dB,-->
     <path name="speaker-dmic-endfire">
         <path name="triple-mic" />
-        <ctl name="DEC5 Volume" value="88" />
-        <ctl name="DEC6 Volume" value="88" />
-        <ctl name="DEC7 Volume" value="88" />
+        <ctl name="DEC5 Volume" value="100" />
+        <ctl name="DEC6 Volume" value="100" />
+        <ctl name="DEC7 Volume" value="100" />
     </path>
 
     <!-- SPKR_PHONE_MIC 3nd D:4 dB -->
@@ -1531,8 +1548,8 @@
     <!-- TX Dual-mic 1st MIC D:4 dB, 2nd MIC:4 dB -->
     <path name="dmic-endfire">
         <path name="handset-dmic-endfire" />
-        <ctl name="DEC7 Volume" value="88" />
-        <ctl name="DEC6 Volume" value="88" />
+        <ctl name="DEC7 Volume" value="97" />
+        <ctl name="DEC6 Volume" value="97" />
     </path>
 
     <!-- Phone RCV TX Dual-mic 1st MIC D:13 dB, 2nd MIC:13 dB -->