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

Commit 3ccdd507 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: atoll: Add button click suppression support"

parents c4acc925 219b4542

configs/atoll/mixer_paths.xml

+55 −42
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ 
    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

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

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

    <ctl name="DEC0_BCS Switch" value="0" />

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

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

    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
@@ -508,6 +509,16 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

    </path>
@@ -2536,48 +2547,49 @@ 


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

    <path name="amic2">

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

        <ctl name="TX SMIC MUX5" value="ADC1" />

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

        <ctl name="TX SMIC MUX0" value="ADC1" />

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

        <ctl name="TX_AIF2_CAP Mixer DEC5" value="1" />

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

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

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

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

    </path>



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

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

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

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

    </path>



    <path name="dmic6">

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

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

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

    </path>



    <path name="speaker">
@@ -2648,7 +2660,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>
@@ -2656,7 +2668,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 INT2 MIX2 INP" value="SRC0" />

        <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" />

    </path>
@@ -2765,6 +2777,7 @@ 
    </path>



    <path name="headset-mic">

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

        <path name="amic2" />

    </path>
@@ -2946,23 +2959,23 @@ 
    <!-- Dual MIC devices -->

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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



    <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">
@@ -3023,15 +3036,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="DMIC1" />

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

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

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

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

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

    </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">
@@ -3041,22 +3054,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="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="DMIC3" />

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

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

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="voice-speaker-tmic">
@@ -3066,14 +3079,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="DMIC1" />

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

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

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

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

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

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

    </path>



    <path name="speaker-qmic-liquid">

configs/atoll/mixer_paths_wcd937x.xml

+11 −1
Original line number Diff line number Diff line
@@ -488,6 +488,16 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

    </path>