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

Commit 71f14240 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 14321c9b on remote branch 

Change-Id: I722dd07dbb445cfe17320c36cf01e82de3385707
parents d9da7226 14321c9b

configs/msm8937/sound_trigger_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <param version="0x0101" /> <!-- this must be the first param -->



    <common_config>

        <param implementer_version="0x0100" />

        <param max_cpe_sessions="1" />

        <param max_ape_sessions="5" />

        <param enable_failure_detection="false" />

configs/msm8953/sound_trigger_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <param version="0x0101" /> <!-- this must be the first param -->



    <common_config>

        <param implementer_version="0x0100" />

        <param max_cpe_sessions="1" />

        <param max_ape_sessions="5" />

        <param enable_failure_detection="false" />

configs/msmnile/audio_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="33" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="40" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="27" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

configs/msmnile/mixer_paths_tavil.xml

+76 −0
Original line number Diff line number Diff line
@@ -3073,4 +3073,80 @@ 
    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />

    </path>



    <path name="incall_music_uplink2 speaker">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset-hac">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco-wb">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-bt-sco">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 voice-tty-hco-handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 speaker-and-bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>

</mixer>

configs/msmnile/sound_trigger_mixer_paths_wcd9340.xml

+9 −0
Original line number Diff line number Diff line
@@ -355,6 +355,15 @@ 
        <ctl name="DMIC MUX3" value="DMIC0" />

    </path>



    <path name="listen-ape-headset-mic">

        <ctl name="AIF3_CAP Mixer SLIM TX2" value="1" />

        <ctl name="SLIM_1_TX Channels" value="One" />

        <ctl name="CDC_IF TX2 MUX" value="DEC2" />

        <ctl name="ADC MUX2" value="AMIC" />

        <ctl name="AMIC MUX2" value="ADC2" />

        <ctl name="DEC2 Volume" value="84" />

    </path>



    <path name="echo-reference">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>