From b28a37c992293c19c3fb5fbfd4a4265c0a60155c Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Wed, 15 Dec 2021 16:43:35 +0800
Subject: [PATCH] audio: enable 96K speaker playback & correct mic2 id

Bug: 210927949
Test: manual

Signed-off-by: Yung Ti Su <andysu@google.com>
Change-Id: Ie1e4537176f6df53780f258cd9924913df476f50
---
 audio/lynx/config/mixer_paths.xml         | 6 ++++--
 audio/lynx/config/mixer_paths_factory.xml | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml
index e3db0cb..47420bb 100644
--- a/audio/lynx/config/mixer_paths.xml
+++ b/audio/lynx/config/mixer_paths.xml
@@ -33,8 +33,10 @@
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
     <ctl name="TDM_0_RX Format" value="S32_LE"/>
+    <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
     <ctl name="TDM_0_TX Chan" value="Four"/>
     <ctl name="TDM_0_TX Format" value="S32_LE"/>
+    <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
 
     <!-- Haptic setting -->
     <ctl name="HAPTIC_RX Format" value="S32_LE"/>
@@ -77,8 +79,8 @@
     <ctl name="R Main AMP Enable Switch" value="0"/>
 
     <!-- Cirrus Booster mode -->
-    <ctl name="PCM Source" value="DSP"/>
-    <ctl name="R PCM Source" value="DSP"/>
+    <ctl name="PCM Source" value="ASP"/>
+    <ctl name="R PCM Source" value="ASP"/>
     <ctl name="DSP1 Firmware" value="Protection"/>
     <ctl name="R DSP1 Firmware" value="Protection"/>
     <ctl name="DSP RX1 Source" value="ASPRX1"/>
diff --git a/audio/lynx/config/mixer_paths_factory.xml b/audio/lynx/config/mixer_paths_factory.xml
index 4e551f2..0133310 100644
--- a/audio/lynx/config/mixer_paths_factory.xml
+++ b/audio/lynx/config/mixer_paths_factory.xml
@@ -17,8 +17,6 @@
     <ctl name="MIC3" value="0" />
     <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
 
-    <ctl name="TDM_0_RX Sample Rate" value="SR_48K" />
-    <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
     <ctl name="TDM_0_RX Mixer US" value="0" />
     <ctl name="US Record Enable" value="0" />
 
@@ -111,7 +109,7 @@
     </path>
 
     <path name="mic2-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />