From ce15fdb3a2eae4940dfae26eb0dda0e72b0eb3e7 Mon Sep 17 00:00:00 2001
From: juyuchen <juyuchen@google.com>
Date: Wed, 16 Oct 2019 14:50:47 +0800
Subject: [PATCH] audio: update table

Bug: 142838853
Test: manual audio tests.

Change-Id: Id072a755310a45b37ef0688a16a7c52bb94422cc
Signed-off-by: juyuchen <juyuchen@google.com>
---
 audio/audio_platform_info_noextcodec_snd.xml |  9 ++-
 audio/mixer_paths_noextcodec_snd.xml         | 63 +++++++++++---------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/audio/audio_platform_info_noextcodec_snd.xml b/audio/audio_platform_info_noextcodec_snd.xml
index 21714f4..79fcbaa 100644
--- a/audio/audio_platform_info_noextcodec_snd.xml
+++ b/audio/audio_platform_info_noextcodec_snd.xml
@@ -28,12 +28,13 @@
     <acdb_ids>
         <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="15"/>
         <device name="SND_DEVICE_IN_VOICE_REC_QMIC_FLUENCE" acdb_id="131"/>
         <device name="SND_DEVICE_IN_VOICE_REC_TMIC" acdb_id="131"/>
         <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" acdb_id="132"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" acdb_id="150"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" acdb_id="150"/>
+        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="15"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>
         <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
@@ -88,8 +89,10 @@
         <usecase name="USECASE_VOWLAN_CALL" type="out" id="-1"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="30"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="38"/>
-        <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="30"/>
-        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>
+        <!-- The pcm device for QUIN TDM hostless playback is 98 -->
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="98"/>
+        <!-- The pcm device for QUIN TDM hostless capture is 99 -->
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="99"/>
         <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>
         <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>
         <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />
diff --git a/audio/mixer_paths_noextcodec_snd.xml b/audio/mixer_paths_noextcodec_snd.xml
index 0c17e0a..d6568bc 100644
--- a/audio/mixer_paths_noextcodec_snd.xml
+++ b/audio/mixer_paths_noextcodec_snd.xml
@@ -476,25 +476,32 @@
     <!-- ALC5513 config end-->
 
     <!-- CS35L41 config -->
+    <!-- QCT QUIN TDM settings -->
     <ctl name="QUIN_TDM_RX_0 Channels" value="Four" />
     <ctl name="QUIN_TDM_TX_0 Channels" value="Four" />
     <ctl name="QUIN_TDM_RX_0 Format" value="S32_LE" />
+    <ctl name="QUIN_TDM_TX_0 Format" value="S32_LE" />
+    <ctl name="QUIN_TDM_RX_0 SampleRate" value="KHZ_48" />
+    <ctl name="QUIN_TDM_TX_0 SampleRate" value="KHZ_48" />
+    <!-- QCT QUIN TDM settings end-->
+    <!-- CS35L41 gain -->
     <ctl name="AMP PCM Gain" value="17" />
     <ctl name="R AMP PCM Gain" value="17" />
+    <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="R Digital PCM Volume" value="817" />
+    <!-- CS35L41 gain end-->
+    <!-- CS35L41 enable to control gain function -->
     <ctl name="DRE DRE Switch" value="1" />
     <ctl name="R DRE DRE Switch" value="1" />
     <ctl name="VBSTMON Output Switch" value="1" />
     <ctl name="R VBSTMON Output Switch" value="1" />
+    <!-- CS35L41 enable to control gain function end-->
     <ctl name="PCM Source" value="DSP" />
     <ctl name="R PCM Source" value="DSP" />
-    <ctl name="DSP Booted" value="0" />
-    <ctl name="R DSP Booted" value="0" />
     <ctl name="DSP1 Firmware" value="Protection" />
     <ctl name="R DSP1 Firmware" value="Protection" />
-    <ctl name="DSP1 Preload Switch" value="1" />
-    <ctl name="R DSP1 Preload Switch" value="1" />
-    <ctl name="Main AMP Enable Switch" value="1" />
-    <ctl name="R Main AMP Enable Switch" value="1" />
+    <ctl name="Main AMP Enable Switch" value="0" />
+    <ctl name="R Main AMP Enable Switch" value="0" />
     <!-- CS35L41 RX slot -->
     <ctl name="ASPRX1 Slot Position" value="0" />
     <ctl name="R ASPRX1 Slot Position" value="1" />
@@ -2051,7 +2058,7 @@
     </path>
 
     <path name="spkr-rx-calib">
-        <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch"  value="1" />
+        <ctl name="QUIN_TDM_RX_DL_HL Switch" value="1" />
     </path>
 
     <path name="spkr-vi-record">
@@ -2119,14 +2126,8 @@
     </path>
 
     <path name="speaker-mono-2">
-        <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
-        <ctl name="WSA RX1 MUX" value="AIF1_PB" />
-        <ctl name="WSA_RX1 INP0" value="RX1" />
-        <ctl name="WSA_COMP2 Switch" value="1" />
-        <ctl name="SpkrRight COMP Switch" value="1" />
-        <ctl name="SpkrRight BOOST Switch" value="1" />
-        <ctl name="SpkrRight VISENSE Switch" value="1" />
-        <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+        <ctl name="Main AMP Enable Switch" value="0"/>
+        <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
     <path name="speaker-safe">
@@ -2185,29 +2186,15 @@
     </path>
 
     <path name="speaker-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
-        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
         <path name="speaker" />
-        <ctl name="VI_FEED_TX Channels" value="Two" />
-        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />
-        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />
     </path>
 
     <path name="voice-speaker-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
-        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
         <path name="speaker-mono" />
-        <ctl name="VI_FEED_TX Channels" value="One" />
-        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />
     </path>
 
     <path name="voice-speaker-2-protected">
-        <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
-        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
         <path name="speaker-mono-2" />
-        <ctl name="VI_FEED_TX Channels" value="One" />
-        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />
     </path>
 
     <path name="voice-speaker-stereo-protected">
@@ -3043,4 +3030,22 @@
     <path name="incall_music_uplink afe-proxy">
         <path name="incall_music_uplink" />
     </path>
+
+    <!-- cs35l41 specific path to load firmware in cs35l41-playback.c -->
+    <path name="cs35l41-load-protection-firmware-start">
+        <ctl name="CCM Reset" value="1" />
+        <ctl name="R CCM Reset" value="1" />
+        <ctl name="DSP Booted" value="0" />
+        <ctl name="R DSP Booted" value="0" />
+        <ctl name="DSP1 Preload Switch" value="0" />
+        <ctl name="R DSP1 Preload Switch" value="0" />
+    </path>
+
+    <path name="cs35l41-load-protection-firmware-end">
+        <ctl name="DSP1 Preload Switch" value="1" />
+        <ctl name="R DSP1 Preload Switch" value="1" />
+        <ctl name="DSP Booted" value="1" />
+        <ctl name="R DSP Booted" value="1" />
+    </path>
+    <!-- cs35l41 specific path to load firmware in cs35l41-playback.c end-->
 </mixer>