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

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

Merge "configs: Update mixer xmls as per latest for bengal"

parents 7e154ce1 adcab10f

configs/bengal/audio_platform_info_intcodec.xml

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="35" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" />

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

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="36" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="23" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->
@@ -173,6 +177,8 @@ 
        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="SLIMBUS_7_TX"/>

configs/bengal/mixer_paths.xml

+115 −39
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ 
    <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />

    <ctl name="MultiMedia17 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia17 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia17 Mixer SLIM_7_TX" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia3" value="0" />
@@ -136,6 +139,7 @@ 
    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />

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

    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
@@ -155,6 +159,8 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

    <ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -203,8 +209,8 @@ 
    <!-- Multimode Voice2 -->

    <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" />

    <!-- Multimode Voice2 BTSCO -->

    <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" />
@@ -230,8 +236,8 @@ 
    <!-- RT Proxy Cal end -->



    <!-- Incall Recording -->

    <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />

    <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />

    <ctl name="MultiMedia9 Mixer VOC_REC_UL" value="0" />

    <ctl name="MultiMedia9 Mixer VOC_REC_DL" value="0" />

    <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />

    <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />

    <!-- Incall Recording End -->
@@ -434,18 +440,25 @@ 


    <path name="echo-reference">

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

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

    </path>

    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference display-port">

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

    <path name="echo-reference headset">

        <path name="echo-reference headphones" />

    </path>



    <path name="echo-reference headphones-44.1">

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

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

    </path>



    <path name="echo-reference bt-sco">
@@ -463,14 +476,17 @@ 


    <path name="echo-reference-voip">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1" />

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

    </path>



    <path name="echo-reference-voip handset">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

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

    </path>



    <path name="echo-reference-voip headphones">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

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

    </path>



    <path name="echo-reference-voip bt-sco">
@@ -1919,7 +1935,7 @@ 
        <ctl name="MultiMedia17 Mixer SLIM_7_TX" value="1" />

    </path>



    <path name="audio-record-compress2 bt-sco-wb">

    <path name="audio-record-compress bt-sco-wb">

        <ctl name="BT SampleRate" value="KHZ_16" />

        <path name="audio-record-compress2 bt-sco" />

    </path>
@@ -1986,7 +2002,7 @@ 
    </path>



    <path name="incall-rec-uplink">

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

        <ctl name="MultiMedia9 Mixer VOC_REC_UL" value="1" />

    </path>



    <path name="incall-rec-uplink bt-sco">
@@ -2013,6 +2029,10 @@ 
        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink-compress headset-mic">

        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink-compress">

        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />

    </path>
@@ -2037,8 +2057,12 @@ 
        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink-compress headset-mic">

        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-downlink">

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

        <ctl name="MultiMedia9 Mixer VOC_REC_DL"  value="1" />

    </path>



    <path name="incall-rec-downlink bt-sco">
@@ -2065,6 +2089,10 @@ 
        <path name="incall-rec-downlink" />

   </path>



    <path name="incall-rec-downlink headset-mic">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink-compress">

        <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />

    </path>
@@ -2089,6 +2117,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink-compress headset-mic">

        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink">

        <path name="incall-rec-uplink" />

        <path name="incall-rec-downlink" />
@@ -2118,6 +2150,10 @@ 
        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink headset-mic">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink-compress">

        <path name="incall-rec-uplink-compress" />

        <path name="incall-rec-downlink-compress" />
@@ -2143,6 +2179,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink-compress headset-mic">

        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="hfp-sco">

    </path>
@@ -2426,6 +2466,10 @@ 
        <path name="audio-record-voip bt-sco" />

    </path>



    <path name="audio-record-voip headset-mic">

        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="spkr-rx-calib">

        <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch"  value="1" />

    </path>
@@ -2446,26 +2490,26 @@ 


    <path name="dmic1">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC0" />

    </path>



    <path name="dmic2">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

    </path>



    <path name="dmic3">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

    </path>



    <path name="dmic4">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

    </path>



    <path name="speaker">
@@ -2512,7 +2556,7 @@ 
    <path name="sidetone-headphones">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="54" />

        <ctl name="IIR0 INP0 MUX" value="DEC0" />

        <ctl name="IIR0 INP0 MUX" value="DEC2" />

        <ctl name="RX INT0 MIX2 INP" value="SRC0" />

        <ctl name="RX INT1 MIX2 INP" value="SRC0" />

    </path>
@@ -2520,7 +2564,7 @@ 
    <path name="sidetone-handset">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="54" />

        <ctl name="IIR0 INP0 MUX" value="DEC0" />

        <ctl name="IIR0 INP0 MUX" value="DEC2" />

        <ctl name="RX INT0 MIX2 INP" value="SRC0" />

    </path>
@@ -2573,6 +2617,10 @@ 
        <path name="headphones" />

    </path>



    <path name="headphones-hifi-filter">

        <path name="headphones" />

    </path>



    <path name="hph-highquality-mode">

        <ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />

        <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -2595,8 +2643,8 @@ 
    </path>



    <path name="headset-mic">

        <path name="amic2" />

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

        <path name="amic2" />

    </path>



    <path name="headset-mic-liquid">
@@ -2670,6 +2718,11 @@ 
        <path name="speaker" />

    </path>



    <path name="speaker-and-headphones-hifi-filter">

        <path name="headphones" />

        <path name="speaker" />

    </path>



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

        <path name="headphones" />

        <path name="speaker-safe" />
@@ -2786,7 +2839,7 @@ 


    <path name="dmic-endfire">

        <path name="handset-dmic-endfire" />

        <ctl name="IIR0 INP0 MUX" value="DEC0" />

        <ctl name="IIR0 INP0 MUX" value="DEC2" />

    </path>



    <path name="dmic-endfire-liquid">
@@ -2847,15 +2900,15 @@ 
    </path>

    <path name="speaker-dmic-broadside">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC1" />

        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

    </path>



    <path name="dmic-broadside">

        <path name="speaker-dmic-broadside" />

        <ctl name="IIR0 INP0 MUX" value="DEC0" />

        <ctl name="IIR0 INP0 MUX" value="DEC2" />

    </path>



    <path name="voice-speaker-dmic-broadside">
@@ -2865,22 +2918,22 @@ 
    <!-- Tri MIC devices -->

    <path name="three-mic">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX DMIC MUX1" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

        <ctl name="TX DMIC MUX2" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC2" />

    </path>



    <path name="speaker-tmic">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC2" />

        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

    </path>



    <path name="voice-speaker-tmic">
@@ -2890,14 +2943,14 @@ 
    <!-- Quad MIC devices -->

    <path name="speaker-qmic">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC2" />

        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />

        <ctl name="TX DMIC MUX4" value="DMIC1" />

    </path>



    <path name="speaker-qmic-liquid">
@@ -2935,11 +2988,21 @@ 
        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-full-headset">

        <ctl name="TTY Mode" value="FULL" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headphones">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headset">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



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

        <ctl name="TTY Mode" value="HCO" />

        <path name="handset" />
@@ -2958,7 +3021,12 @@ 
    </path>



    <path name="voice-tty-hco-headset-mic">

        <path name="voice-tty-full-headset-mic" />

        <ctl name="TX DEC6 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX6" value="SWR_MIC4" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC6" value="1" />

        <ctl name="ADC2_MIXER Switch" value="1" />

        <ctl name="ADC2 MUX" value="INP2" />

    </path>



    <path name="voice-tty-vco-handset-mic">
@@ -3212,6 +3280,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="mmap-playback headset">

        <path name="mmap-playback headphones" />

    </path>



    <path name="mmap-playback speaker-and-headphones">

        <path name="mmap-playback" />

        <path name="mmap-playback headphones" />
@@ -3406,6 +3478,10 @@ 
        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink headset">

        <path name="incall_music_uplink" />

    </path>



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

        <path name="incall_music_uplink" />

    </path>