Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6266d883 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Update I2S XMLs for SDC845"

parents f8c64ee3 8ebbfed2

configs/sdm845/audio_platform_info_i2s.xml

+15 −7
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
<!-- 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>

    <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" />
@@ -32,4 +33,11 @@ 
        <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>

    <pcm_ids>

        <usecase name="USECASE_VOICEMMODE1_CALL" type="in" id="2"/>

        <usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="2"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="3"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="3"/>

    </pcm_ids>

</audio_platform_info_i2s>

configs/sdm845/mixer_paths_i2s.xml

+54 −31
Original line number Diff line number Diff line
@@ -68,15 +68,30 @@ 
    <ctl name="SLIM RX3 MUX" value="AIF1_PB" />

    <ctl name="CLASS_H_DSM MUX" value="ZERO" />



    <!-- 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="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="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" />

    <ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />

    <!-- RT Proxy Cal end -->



    <!-- mixer control to disable lowlatency qos voting -->

    <ctl name="MultiMedia5_RX QOS Vote" value="Disable" />

    <!-- mixer control to disable lowlatency qos voting end -->



    <!-- These are audio route (FE to BE) specific mixer settings -->

    <path name="deep-buffer-playback">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="1" />
@@ -86,10 +101,6 @@ 
        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback resume">

        <ctl name="MultiMedia5_RX QOS Vote" value="Enable" />

    </path>



    <path name="compress-offload-playback">

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -102,6 +113,28 @@ 
        <ctl name="MultiMedia8 Mixer AUX_PCM_UL_TX" value="1" />

    </path>



    <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="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="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="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>



    <path name="gsm-mode">

        <ctl name="GSM mode Enable" value="ON" />

    </path>



    <!-- These are actual sound device specific mixer settings -->

    <path name="adc1">

        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1"/>
@@ -111,10 +144,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">
@@ -176,23 +210,20 @@ 
    </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">
@@ -215,10 +246,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" />
@@ -231,10 +258,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>