From 36953228ad895b4205b0a45bf694960497df28d5 Mon Sep 17 00:00:00 2001
From: BubbleFang <bubblefang@google.com>
Date: Tue, 24 Dec 2019 11:12:38 +0800
Subject: [PATCH] audio: update audio_platform and mixer for HAC

mixer : add HAC RX routing "voice-hac-handset"
audio platform:
add => <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" interface="QUIN_TDM_RX_0"/>
add => Spirent sim detect
modify=> <device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="56"/>
modify=> <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" acdb_id="41"/>
modify=> <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="4"/>

Bug: 146398789
Test: Local test
Change-Id: I3a8de25d94298877cc9ada809d5ace667e444a75
Signed-off-by: BubbleFang <bubblefang@google.com>
---
 audio/audio_platform_info_noextcodec_snd.xml | 19 +++++++++++++++----
 audio/mixer_paths_noextcodec_snd.xml         | 10 +++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/audio/audio_platform_info_noextcodec_snd.xml b/audio/audio_platform_info_noextcodec_snd.xml
index 65a582d..622803f 100644
--- a/audio/audio_platform_info_noextcodec_snd.xml
+++ b/audio/audio_platform_info_noextcodec_snd.xml
@@ -36,7 +36,7 @@
         <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="98"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" acdb_id="14"/>
         <device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" acdb_id="10"/>
-        <device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="56"/>
+        <device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="10"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET" acdb_id="514"/>
         <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="513"/>
@@ -63,11 +63,11 @@
         <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="143"/>
         <device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" acdb_id="8"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="512"/>
-        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" acdb_id="41"/>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" acdb_id="41"/>
         <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="19"/>
         <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" acdb_id="109"/>
         <device name="SND_DEVICE_IN_USB_HEADSET_MIC" acdb_id="4"/>
-        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="4"/>
+        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="19"/>
         <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="19"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_SPEAKER" acdb_id="14"/>
         <device name="SND_DEVICE_IN_VOICE_TTY_VCO_SPEAKER_MIC" acdb_id="19"/>
@@ -79,7 +79,17 @@
         <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE" acdb_id="65"/>
         <device name="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT" acdb_id="66"/>
     </acdb_ids>
-
+    <external_specific_dev>
+        <!-- condor -->
+        <ext_device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" usbid="18d1:5034" acdb_id="56" />
+        <ext_device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" usbid="18d1:5034" acdb_id="55" />
+        <!-- condor_Sprint -->
+        <ext_device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" usbid="18d1:5038" acdb_id="53" />
+        <ext_device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" usbid="18d1:5038" acdb_id="94" />
+        <!-- condor_Spirent-->
+        <ext_device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" usbid="18d1:5036" acdb_id="76" />
+        <ext_device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" usbid="18d1:5036" acdb_id="75" />
+    </external_specific_dev>
     <module_ids>
         <aec>
             <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" module_id="0x10F35" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
@@ -194,6 +204,7 @@
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="QUIN_TDM_RX_0"/>
+        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" interface="QUIN_TDM_RX_0"/>
         <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="QUIN_TDM_RX_0"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="QUIN_TDM_RX_0"/>
diff --git a/audio/mixer_paths_noextcodec_snd.xml b/audio/mixer_paths_noextcodec_snd.xml
index 5fa1a14..89c59e8 100644
--- a/audio/mixer_paths_noextcodec_snd.xml
+++ b/audio/mixer_paths_noextcodec_snd.xml
@@ -546,6 +546,8 @@
     <!-- CS35L41 dsp(firmware) source end-->
     <!-- CS35L41 config end-->
 
+    <ctl name="HAC AMP EN" value="0" />
+
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="gsm-mode">
         <ctl name="GSM mode Enable" value="ON" />
@@ -1936,10 +1938,17 @@
     <path name="headset-mic-liquid">
         <path name="amic2" />
     </path>
+
     <path name="voice-handset">
         <path name="handset" />
     </path>
 
+    <path name="voice-hac-handset">
+        <ctl name="HAC AMP EN" value="1" />
+        <ctl name="Main AMP Enable Switch" value="1"/>
+        <ctl name="R Main AMP Enable Switch" value="0"/>
+    </path>
+
     <path name="voice-handset-tmus">
         <path name="handset" />
     </path>
@@ -2248,7 +2257,6 @@
         <path name="voice-speaker"/>
     </path>
 
-
     <path name="voice-tty-hco-handset-hdk">
         <ctl name="TTY Mode" value="HCO" />
         <path name="voice-speaker-hdk" />