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

Commit 1f1d4ba7 authored by pavanc's avatar pavanc Committed by Gerrit - the friendly Code Review server
Browse files

configs: msm8953: Add speaker and headphones paths 

When notification sound is played during voice call, voice-speaker-and
-headphones device is selected. Usecase paths are missing for this
combo in internal codec mixer paths xml files.

Added use case paths for HS and SPKR combo device.
CRs-Fixed: 2163130

Change-Id: Ifdd96025a44453cbb8188675aa6624e573e85c20
parent 146c371e

configs/msm8953/mixer_paths.xml

+61 −0
Original line number Diff line number Diff line
@@ -267,6 +267,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -305,6 +309,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

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

    </path>



    <path name="audio-ull-playback">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="1" />

    </path>
@@ -339,6 +347,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -368,6 +380,10 @@ 
        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -376,6 +392,10 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 speaker-and-headphones">

        <path name="compress-offload-playback2" />

    </path>



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

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

    </path>
@@ -388,6 +408,10 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="compress-offload-playback3 speaker-and-headphones">

        <path name="compress-offload-playback4" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -396,6 +420,11 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia11" value="1" />

    </path>





    <path name="compress-offload-playback4 speaker-and-headphones">

        <path name="compress-offload-playback4" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -404,6 +433,10 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 speaker-and-headphones">

        <path name="compress-offload-playback5" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -412,6 +445,10 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 speaker-and-headphones">

        <path name="compress-offload-playback6" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -420,6 +457,10 @@ 
        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia14" value="1" />

    </path>



   <path name="compress-offload-playback7 speaker-and-headphones">

        <path name="compress-offload-playback7" />

    </path>



    <path name="audio-record">

        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />

    </path>
@@ -557,6 +598,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="voicemmode1-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TERT_MI2S_TX_MMode1" value="1" />
@@ -581,6 +626,10 @@ 
       <path name="voicemmode1-call usb-headphones" />

    </path>



    <path name="voicemmode1-call speaker-and-headphones">

        <path name="voicemmode1-call" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -605,6 +654,10 @@ 
       <path name="voicemmode2-call usb-headphones" />

    </path>



    <path name="voicemmode2-call speaker-and-headphones">

        <path name="voicemmode2-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -793,6 +846,10 @@ 
       <path name="volte-call usb-headphones" />

    </path>



    <path name="volte-call speaker-and-headphones">

        <path name="volte-call" />

    </path>



    <path name="compress-voip-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
@@ -819,6 +876,10 @@ 
        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value='1' />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />

configs/msm8953/mixer_paths_mtp.xml

+60 −0
Original line number Diff line number Diff line
@@ -303,6 +303,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -350,6 +354,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

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

    </path>



    <path name="audio-ull-playback">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="1" />

    </path>
@@ -393,6 +401,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -431,6 +443,10 @@ 
        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -461,6 +477,10 @@ 
        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback2 speaker-and-headphones">

        <path name="compress-offload-playback2" />

    </path>



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

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

    </path>
@@ -482,6 +502,10 @@ 
        <path name="compress-offload-playback3" />

    </path>



    <path name="compress-offload-playback3 speaker-and-headphones">

        <path name="compress-offload-playback3" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -499,6 +523,10 @@ 
        <path name="compress-offload-playback4" />

    </path>



    <path name="compress-offload-playback4 speaker-and-headphones">

        <path name="compress-offload-playback4" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -516,6 +544,10 @@ 
        <path name="compress-offload-playback5" />

    </path>



    <path name="compress-offload-playback5 speaker-and-headphones">

        <path name="compress-offload-playback5" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -533,6 +565,10 @@ 
        <path name="compress-offload-playback6" />

    </path>



    <path name="compress-offload-playback6 speaker-and-headphones">

        <path name="compress-offload-playback6" />

    </path>



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

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -550,6 +586,10 @@ 
        <path name="compress-offload-playback7" />

    </path>



    <path name="compress-offload-playback7 speaker-and-headphones">

        <path name="compress-offload-playback7" />

    </path>



    <path name="audio-record">

        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />

    </path>
@@ -687,6 +727,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="voicemmode1-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TERT_MI2S_TX_MMode1" value="1" />
@@ -711,6 +755,10 @@ 
       <path name="voicemmode1-call usb-headphones" />

    </path>



    <path name="voicemmode1-call speaker-and-headphones">

        <path name="voicemmode1-call" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2" value="1" />
@@ -735,6 +783,10 @@ 
       <path name="voicemmode2-call usb-headphones" />

    </path>



    <path name="voicemmode2-call speaker-and-headphones">

        <path name="voicemmode2-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -923,6 +975,10 @@ 
       <path name="volte-call usb-headphones" />

    </path>



    <path name="volte-call speaker-and-headphones">

        <path name="volte-call" />

    </path>



    <path name="compress-voip-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
@@ -949,6 +1005,10 @@ 
        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value='1' />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="qchat-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />

        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />

configs/msm8953/mixer_paths_qrd_skuh.xml

+32 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -272,6 +276,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

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

    </path>



    <path name="audio-ull-playback">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="1" />

    </path>
@@ -306,6 +314,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -336,6 +348,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

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

    </path>



    <path name="audio-record">

        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />

    </path>
@@ -389,6 +405,10 @@ 
        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />

    </path>



    <path name="voice-call speaker-and-headphones">

       <path name="voice-call" />

    </path>



    <path name="voice2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voice2" value="1" />

        <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
@@ -409,6 +429,10 @@ 
       <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />

    </path>



    <path name="voice2-call speaker-and-headphones">

       <path name="voice2-call" />

    </path>



    <path name="play-fm">

        <ctl name="Internal FM RX Volume" value="1" />

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
@@ -440,6 +464,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -537,6 +565,10 @@ 
        <path name="compress-voip-call bt-sco" />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="listen-voice-wakeup-1">

        <ctl name="LSM1 MUX" value="TERT_MI2S_TX" />

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

configs/msm8953/mixer_paths_qrd_skuhf.xml

+36 −0
Original line number Diff line number Diff line
@@ -237,6 +237,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -270,6 +274,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

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

    </path>



    <path name="audio-ull-playback">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="1" />

    </path>
@@ -304,6 +312,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -330,6 +342,10 @@ 
        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

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

    </path>



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

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

    </path>
@@ -387,6 +403,10 @@ 
        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />

    </path>



    <path name="voice-call speaker-and-headphones">

        <path name="voice-call" />

    </path>



    <path name="voice2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voice2" value="1" />

        <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
@@ -407,6 +427,10 @@ 
       <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />

    </path>



    <path name="voice2-call speaker-and-headphones">

        <path name="voice2-call" />

    </path>



    <path name="play-fm">

        <ctl name="Internal FM RX Volume" value="1" />

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
@@ -438,6 +462,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -520,6 +548,10 @@ 
        <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />

   </path>



    <path name="volte-call speaker-and-headphones">

        <path name="volte-call" />

    </path>



    <path name="compress-voip-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
@@ -535,6 +567,10 @@ 
        <path name="compress-voip-call bt-sco" />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="listen-voice-wakeup-1">

        <ctl name="LSM1 MUX" value="TERT_MI2S_TX" />

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />

configs/msm8953/mixer_paths_qrd_skui.xml

+35 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-headphones">

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

    </path>



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

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -272,6 +276,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

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

    </path>



    <path name="audio-ull-playback">

        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia3" value="1" />

    </path>
@@ -306,6 +314,10 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

    </path>



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

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

    </path>
@@ -336,6 +348,10 @@ 
        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback speaker-and-headphones">

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

    </path>



    <path name="audio-record">

        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />

    </path>
@@ -389,6 +405,9 @@ 
        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />

    </path>



    <path name="voice-call speaker-and-headphones">

        <path name="voice-call" />

    </path>

    <path name="voice2-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voice2" value="1" />

        <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
@@ -409,6 +428,10 @@ 
       <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />

    </path>



    <path name="voice2-call speaker-and-headphones">

        <path name="voice2-call" />

    </path>



    <path name="play-fm">

        <ctl name="Internal FM RX Volume" value="1" />

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
@@ -440,6 +463,10 @@ 
        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />

    </path>



    <path name="vowlan-call speaker-and-headphones">

        <path name="vowlan-call" />

    </path>



    <path name="hfp-sco">

        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />

        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
@@ -522,6 +549,10 @@ 
        <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />

   </path>



    <path name="volte-call speaker-and-headphones">

        <path name="volte-call" />

    </path>



    <path name="compress-voip-call">

        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
@@ -537,6 +568,10 @@ 
        <path name="compress-voip-call bt-sco" />

    </path>



    <path name="compress-voip-call speaker-and-headphones">

        <path name="compress-voip-call" />

    </path>



    <path name="listen-voice-wakeup-1">

        <ctl name="LSM1 MUX" value="TERT_MI2S_TX" />

        <ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />