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

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

Merge 61b888b8 on remote branch

Change-Id: I8c82777bd5fb1e27519e6ae7d1eb42f34cacd0b6
parents 28b9252a 61b888b8
Loading
Loading
Loading
Loading
+68 −44
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@
    <!-- 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" />
@@ -214,8 +215,8 @@
    <!-- Multimode Voice2 -->
    <ctl name="WSA_CDC_DMA_RX_0_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" />
@@ -335,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" />
@@ -471,6 +473,7 @@

    <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 headset">
@@ -479,6 +482,7 @@

    <path name="echo-reference display-port">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
        <ctl name="EC Reference Channels" value="Two"/>
    </path>

    <path name="echo-reference display-port1">
@@ -487,14 +491,32 @@

    <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-voip">
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="Two"/>
    </path>

    <path name="echo-reference-voip handset">
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_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 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">
@@ -2525,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">
@@ -2637,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>
@@ -2645,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>
@@ -2717,7 +2740,7 @@
    </path>

    <path name="handset-mic">
        <path name="dmic2" />
        <path name="dmic1" />
    </path>

    <path name="headphones">
@@ -2754,6 +2777,7 @@
    </path>

    <path name="headset-mic">
        <ctl name="TX_DEC0 Volume" value="84" />
        <path name="amic2" />
    </path>

@@ -2935,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">
@@ -3012,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">
@@ -3030,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">
@@ -3055,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">
+56 −46
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@
    <!-- Multimode Voice2 -->
    <ctl name="WSA_CDC_DMA_RX_0_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" />
@@ -324,6 +324,7 @@
    <ctl name="ADC2 MUX" value="ZERO" />
    <ctl name="ADC3_MIXER Switch" value="0" />
    <ctl name="ADC3 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" />
@@ -2843,75 +2844,76 @@

    <!-- These are actual sound device specific mixer settings -->
    <path name="amic1">
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="ADC0" />
        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX2" value="ADC0" />
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="ADC1_MIXER Switch" value="1" />
    </path>

    <path name="amic2">
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="ADC1" />
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
        <ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
        <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="amic3">
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="ADC1" />
        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX2" value="ADC1" />
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="ADC2_MIXER Switch" value="1" />
        <ctl name="ADC2 MUX" value="INP3" />
    </path>

    <path name="amic4">
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="ADC2" />
        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX2" value="ADC2" />
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="ADC3_MIXER Switch" value="1" />
        <ctl name="ADC3 MUX" value="INP4" />
    </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">
@@ -3019,7 +3021,7 @@
    </path>

    <path name="handset-mic">
        <path name="dmic2" />
        <path name="amic1" />
    </path>

    <path name="headphones">
@@ -3188,13 +3190,13 @@
    <!-- Dual MIC devices -->
    <path name="handset-dmic-endfire">
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="ADC0" />
        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
        <ctl name="ADC1_MIXER Switch" value="1" />
        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX1" value="ADC1" />
        <ctl name="TX SMIC MUX1" value="ADC0" />
        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
        <ctl name="ADC1_MIXER Switch" value="1" />
        <ctl name="TX DEC2 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX2" value="ADC1" />
        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="ADC2_MIXER Switch" value="1" />
        <ctl name="ADC2 MUX" value="INP3" />
    </path>
@@ -3311,28 +3313,36 @@

    <path name="three-mic">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
        <ctl name="TX DMIC MUX3" value="DMIC1" />
         <ctl name="TX DEC1 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX1" value="ADC0" />
         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
        <ctl name="TX DMIC MUX1" value="DMIC3" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="TX DEC2 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX2" value="ADC1" />
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="TX DMIC MUX2" value="DMIC2" />
         <ctl name="ADC2_MIXER Switch" value="1" />
         <ctl name="ADC2 MUX" value="INP3" />
         <ctl name="TX DEC3 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX3" value="ADC2" />
         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
         <ctl name="ADC3_MIXER Switch" value="1" />
         <ctl name="ADC3 MUX" value="INP4" />
    </path>

    <path name="speaker-tmic">
         <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
         <ctl name="TX DEC0 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX0" value="ADC0" />
         <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="TX DEC1 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX1" value="ADC1" />
         <ctl name="TX SMIC MUX1" value="ADC0" />
         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
         <ctl name="ADC2_MIXER Switch" value="1" />
         <ctl name="ADC2 MUX" value="INP3" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="TX DEC2 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX2" value="ADC2" />
         <ctl name="TX SMIC MUX2" value="ADC1" />
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
         <ctl name="ADC2_MIXER Switch" value="1" />
         <ctl name="ADC2 MUX" value="INP3" />
         <ctl name="TX DEC3 MUX" value="SWR_MIC" />
         <ctl name="TX SMIC MUX3" value="ADC2" />
         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
         <ctl name="ADC3_MIXER Switch" value="1" />
         <ctl name="ADC3 MUX" value="INP4" />
    </path>
+15 −1
Original line number Diff line number Diff line
@@ -152,6 +152,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" />
@@ -454,6 +456,7 @@

    <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 headset">
@@ -462,6 +465,7 @@

    <path name="echo-reference display-port">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
        <ctl name="EC Reference Channels" value="Two"/>
    </path>

    <path name="echo-reference headphones-44.1">
@@ -484,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>
@@ -2560,7 +2574,7 @@
    </path>

    <path name="handset-mic">
        <path name="dmic2" />
        <path name="dmic1" />
    </path>

    <path name="headphones">
+19 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@
    <!-- 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" />
@@ -435,10 +436,21 @@

    <path name="echo-reference">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0" />
        <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 headset">
        <path name="echo-reference headphones" />
    </path>

    <path name="echo-reference headset">
@@ -447,30 +459,37 @@

    <path name="echo-reference display-port">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
        <ctl name="EC Reference Channels" value="Two"/>
    </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-voip">
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
        <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 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">
+40 −23

File changed.

Preview size limit exceeded, changes collapsed.

Loading