muskie: audio: Update audio table

1.Add usb routing in mixer_paths/audio_platform_info/ ACDB
 -Adding USB headset and USB headphones scenario
 -Correct voicecall headphone TX routing path to slimbus
2.Add TAS2557 EC ref routing in mixer_paths

Change-Id: I055571cf4502b68bf7938a099a724a746a0e955c
Signed-off-by: vincent_tew <vincent_tew@htc.com>
This commit is contained in:
vincent_tew
2017-03-10 10:26:24 +08:00
committed by David Lin
parent 00fbe98de7
commit f962a79d64
4 changed files with 1802 additions and 4 deletions

View File

@@ -81,6 +81,7 @@
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" backend="speaker-and-usb-headphones" interface="QUAT_MI2S_RX-and-USB_AUDIO_RX"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES" backend="speaker-and-headphones" interface="QUAT_MI2S_RX-and-SLIMBUS_6_RX"/>
<device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="QUAT_MI2S_RX"/>

View File

@@ -71,6 +71,7 @@
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" backend="speaker-and-usb-headphones" interface="QUAT_MI2S_RX-and-USB_AUDIO_RX"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" backend="speaker" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="QUAT_MI2S_RX"/>

1762
mixer_paths_tasha.xml Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -196,7 +196,7 @@
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
<ctl name="USB_AUDIO_RX Channels" value="One" />
<ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
<ctl name="USB_AUDIO_RX Format" value="S16_LE" />
<ctl name="USB_AUDIO_TX Channels" value="One" />
@@ -461,6 +461,7 @@
<!-- Voice external ec. reference -->
<ctl name="VOC_EXT_EC MUX" value="NONE" />
<ctl name="Stereo EchoRef Ctrl" value="right channel" />
<ctl name="AIF3_CAP Mixer SLIM TX1" value="0" />
<ctl name="AIF3_CAP Mixer SLIM TX2" value="0" />
<!-- Voice external ec. reference end -->
@@ -659,6 +660,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback usb-headset">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback speaker-and-usb-headphones">
<path name="deep-buffer-playback usb-headphones" />
<path name="deep-buffer-playback speaker" />
@@ -711,6 +716,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback usb-headset">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback speaker-and-usb-headphones">
<path name="low-latency-playback usb-headphones" />
<path name="low-latency-playback speaker" />
@@ -763,6 +772,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
</path>
<path name="audio-ull-playback usb-headset">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia8" value="1" />
</path>
<path name="audio-ull-playback speaker-and-usb-headphones">
<path name="audio-ull-playback usb-headphones" />
<path name="audio-ull-playback speaker" />
@@ -814,6 +827,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback usb-headset">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback speaker-and-usb-headphones">
<path name="compress-offload-playback usb-headphones" />
<path name="compress-offload-playback speaker" />
@@ -914,6 +931,7 @@
</path>
<path name="voicemmode1-call speaker">
<ctl name="VOC_EXT_EC MUX" value="QUAT_MI2S_TX" />
<ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
@@ -944,6 +962,11 @@
</path>
<path name="voicemmode1-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
<path name="voicemmode1-call usb-headset">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
@@ -954,6 +977,7 @@
</path>
<path name="voicemmode2-call speaker">
<ctl name="VOC_EXT_EC MUX" value="QUAT_MI2S_TX" />
<ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
@@ -984,6 +1008,11 @@
</path>
<path name="voicemmode2-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call usb-headset">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
@@ -1311,10 +1340,12 @@
<ctl name="DEC7 Volume" value="88" />
</path>
<!-- SPKR_PHONE_MIC 3nd D:4 dB -->
<!-- SPKR_PHONE_MIC 3rd:DEC5 16dB, 2nd:DEC6 16dB, 1st:DEC7 16dB,-->
<path name="speaker-mic">
<path name="dmic3" />
<ctl name="DEC5 Volume" value="88" />
<path name="triple-mic" />
<ctl name="DEC5 Volume" value="100" />
<ctl name="DEC6 Volume" value="100" />
<ctl name="DEC7 Volume" value="100" />
</path>
<!-- TX Main-mic D:4 dB -->
@@ -1554,6 +1585,9 @@
<path name="usb-headphones">
</path>
<path name="usb-headset">
</path>
<path name="afe-proxy">
</path>