dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

APQ8096: update mixer paths for tasha codec 

Update mixer paths to be compatible with tasha.
Hard code device to always be headset as this is the only support device.

Change-Id: Ibb5733d4d8542bd060cf926b05dcdfb10c6fab01
This commit is contained in:
Siena Richard 2017-06-14 13:22:23 -07:00 committed by Shiv Maliyappanahalli
parent 63839665f4
commit a75b82c2d8
2 changed files with 73 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
configs/msm8996/audio_platform_info_i2s.xml
View File

@ -1,35 +1,37 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
<!-- -->
<!-- Redistribution and use in source and binary forms, with or without -->
<!-- modification, are permitted provided that the following conditions are -->
<!-- met: -->
<!-- * Redistributions of source code must retain the above copyright -->
<!-- notice, this list of conditions and the following disclaimer. -->
<!-- * Redistributions in binary form must reproduce the above -->
<!-- copyright notice, this list of conditions and the following -->
<!-- disclaimer in the documentation and/or other materials provided -->
<!-- with the distribution. -->
<!-- * Neither the name of The Linux Foundation nor the names of its -->
<!-- contributors may be used to endorse or promote products derived -->
<!-- from this software without specific prior written permission. -->
<!-- -->
<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<!-- Copyright (c) 2014, 2016-2017, The Linux Foundation. All rights reserved. -->
<!-- -->
<!-- Redistribution and use in source and binary forms, with or without -->
<!-- modification, are permitted provided that the following conditions are -->
<!-- met: -->
<!-- * Redistributions of source code must retain the above copyright -->
<!-- notice, this list of conditions and the following disclaimer. -->
<!-- * Redistributions in binary form must reproduce the above -->
<!-- copyright notice, this list of conditions and the following -->
<!-- disclaimer in the documentation and/or other materials provided -->
<!-- with the distribution. -->
<!-- * Neither the name of The Linux Foundation nor the names of its -->
<!-- contributors may be used to endorse or promote products derived -->
<!-- from this software without specific prior written permission. -->
<!-- -->
<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<audio_platform_info_i2s>
<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="8" />
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="8" />
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="8" />
<device name="SND_DEVICE_OUT_HANDSET" acdb_id="10" />
<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="10" />
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="10" />
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="10" />
<acdb_ids>
<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="8" />
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="8" />
<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="8" />
<device name="SND_DEVICE_OUT_HANDSET" acdb_id="10" />
<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="10" />
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="10" />
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="10" />
</acdb_ids>
</audio_platform_info_i2s>

103
configs/msm8996/mixer_paths_i2s.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -->
<!-- Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. -->
<!-- -->
<!-- Redistribution and use in source and binary forms, with or without -->
<!-- modification, are permitted provided that the following conditions are -->
@ -68,30 +68,24 @@
<ctl name="SLIM RX3 MUX" value="AIF1_PB" />
<ctl name="CLASS_H_DSM MUX" value="ZERO" />
<!-- Voice -->
<ctl name="Voice Stub Tx Mixer PRI_MI2S_TX" value="0" />
<!-- Multimode Voice1 -->
<ctl name="Voice Stub Tx Mixer TERT_MI2S_TX" value="0" />
<ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="0" />
<ctl name="Voice Stub Tx Mixer QUAT_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX_Voice Mixer Voice Stub" value="0" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
<!-- Voice end-->
<!-- VoLTE -->
<ctl name="VoLTE Stub Tx Mixer PRI_MI2S_TX" value="0" />
<ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="0" />
<ctl name="VoLTE Stub Tx Mixer QUAT_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX_Voice Mixer VoLTE Stub" value="0" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
<!-- VoLTE end-->
<!-- Voice2 -->
<ctl name="Voice2 Stub Tx Mixer PRI_MI2S_TX" value="0" />
<ctl name="TERT_MI2S_RX_Voice Mixer Voice Stub" value="0" />
<ctl name="QUAT_MI2S_RX Port Mixer TERT_MI2S_TX" value="0" />
<ctl name="TERT_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
<!-- Multimode Voice1 end -->
<!-- Multimode Voice2 -->
<ctl name="Voice2 Stub Tx Mixer TERT_MI2S_TX" value="0" />
<ctl name="QUAT_MI2S_RX_Voice Mixer Voice2 Stub" value="0" />
<ctl name="Voice2 Stub Tx Mixer QUAT_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX_Voice Mixer Voice2 Stub" value="0" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="0" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
<!-- Voice2 end-->
<ctl name="TERT_MI2S_RX_Voice Mixer Voice2 Stub" value="0" />
<ctl name="QUAT_MI2S_RX Port Mixer TERT_MI2S_TX" value="0" />
<ctl name="TERT_MI2S_RX Port Mixer QUAT_MI2S_TX" value="0" />
<!-- Multimode Voice2 end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
@ -119,31 +113,22 @@
<ctl name="MultiMedia8 Mixer AUX_PCM_UL_TX" value="1" />
</path>
<path name="voice-call">
<ctl name="Voice Stub Tx Mixer PRI_MI2S_TX" value="1" />
<path name="voicemmode1-call">
<ctl name="Voice Stub Tx Mixer TERT_MI2S_TX" value="1" />
<ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
<ctl name="Voice Stub Tx Mixer QUAT_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX_Voice Mixer Voice Stub" value="1" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
<ctl name="TERT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
<ctl name="QUAT_MI2S_RX Port Mixer TERT_MI2S_TX" value="1" />
<ctl name="TERT_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
</path>
<path name="volte-call">
<ctl name="VoLTE Stub Tx Mixer PRI_MI2S_TX" value="1" />
<ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
<ctl name="VoLTE Stub Tx Mixer QUAT_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX_Voice Mixer VoLTE Stub" value="1" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
</path>
<path name="voice2-call">
<ctl name="Voice2 Stub Tx Mixer PRI_MI2S_TX" value="1" />
<path name="voicemmode2-call">
<ctl name="Voice2 Stub Tx Mixer TERT_MI2S_TX" value="1" />
<ctl name="QUAT_MI2S_RX_Voice Mixer Voice2 Stub" value="1" />
<ctl name="Voice2 Stub Tx Mixer QUAT_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX_Voice Mixer Voice2 Stub" value="1" />
<ctl name="QUAT_MI2S_RX Port Mixer PRI_MI2S_TX" value="1" />
<ctl name="PRI_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
<ctl name="TERT_MI2S_RX_Voice Mixer Voice2 Stub" value="1" />
<ctl name="QUAT_MI2S_RX Port Mixer TERT_MI2S_TX" value="1" />
<ctl name="TERT_MI2S_RX Port Mixer QUAT_MI2S_TX" value="1" />
</path>
<!-- These are actual sound device specific mixer settings -->
@ -155,10 +140,11 @@
</path>
<path name="adc2">
<ctl name="AIF1_CAP Mixer SLIM TX9" value="1"/>
<ctl name="QUAT_MI2S_TX Channels" value="One" />
<ctl name="SLIM TX9 MUX" value="DEC5" />
<ctl name="DEC5 MUX" value="ADC2" />
<ctl name="MI2S_TX Channels" value="One" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1"/>
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="AMIC" />
<ctl name="AMIC MUX8" value="ADC2" />
</path>
<path name="dmic1">
@ -220,27 +206,24 @@
</path>
<path name="headphones">
<ctl name="SLIM RX2 MUX" value="AIF1_PB" />
<ctl name="SLIM RX3 MUX" value="AIF1_PB" />
<ctl name="SLIM RX4 MUX" value="AIF1_PB" />
<ctl name="QUAT_MI2S_RX Channels" value="Two" />
<ctl name="RX1 MIX1 INP1" value="RX3" />
<ctl name="RX2 MIX1 INP1" value="RX4" />
<ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
<ctl name="HPHL DAC Switch" value="1" />
<ctl name="MI2S_RX Channels" value="Two" />
<ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="COMP1 Switch" value="1" />
</path>
<path name="line">
<path name="headphones" />
<ctl name="COMP2 Switch" value="1" />
</path>
<path name="headset-mic">
<path name="adc2" />
<ctl name="ADC2 Volume" value="13" />
<ctl name="DEC8 Volume" value="84" />
</path>
<path name="voice-handset">
<path name="handset" />
<path name="headphones" />
</path>
<path name="voice-handset-tmus">
@ -259,10 +242,6 @@
<path name="headphones" />
</path>
<path name="voice-line">
<path name="voice-headphones" />
</path>
<path name="voice-headset-mic">
<path name="headset-mic" />
<path name="sidetone-headphones" />
@ -275,10 +254,6 @@
<ctl name="COMP0 Switch" value="1" />
</path>
<path name="speaker-and-line">
<path name="speaker-and-headphones" />
</path>
<path name="voice-rec-mic">
<path name="handset-mic" />
</path>