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

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

Merge 4a6aff44 on remote branch 

Change-Id: I004f75cb6293eeda7af8eb6b5322383be384d893
parents 3226e8dc 4a6aff44

configs/atoll/audio_platform_info_intcodec.xml

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ 
        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -189,9 +191,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

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

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

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

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

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

configs/atoll/mixer_paths.xml

+5 −0
Original line number Diff line number Diff line
@@ -2972,6 +2972,7 @@ 
        <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_DEC2 Volume" value="84" />

    </path>



    <path name="speaker-dmic-endfire">
@@ -2980,6 +2981,7 @@ 
        <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_DEC2 Volume" value="84" />

    </path>



    <path name="dmic-endfire">
@@ -3069,6 +3071,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

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

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

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

    </path>



    <path name="speaker-tmic">
@@ -3079,6 +3082,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC0" />

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

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

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

    </path>



    <path name="voice-speaker-tmic">
@@ -3094,6 +3098,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

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

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

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

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

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

    </path>

configs/atoll/mixer_paths_qrd.xml

100644 → 100755
+13 −4
Original line number Diff line number Diff line
@@ -3204,14 +3204,23 @@ 
        <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 SMIC MUX2" value="ADC2" />

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

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

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

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

        <ctl name="ADC3 MUX" value="INP4" />

    </path>



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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX2" value="ADC0" />

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

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

    </path>



    <path name="dmic-endfire">

configs/atoll/mixer_paths_wcd937x.xml

+5 −0
Original line number Diff line number Diff line
@@ -2981,6 +2981,7 @@ 
        <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_DEC2 Volume" value="84" />

    </path>



    <path name="speaker-dmic-endfire">
@@ -2989,6 +2990,7 @@ 
        <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_DEC2 Volume" value="84" />

    </path>



    <path name="dmic-endfire">
@@ -3078,6 +3080,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

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

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

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

    </path>



    <path name="speaker-tmic">
@@ -3088,6 +3091,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC0" />

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

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

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

    </path>



    <path name="voice-speaker-tmic">
@@ -3103,6 +3107,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

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

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

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

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

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

    </path>

configs/kona/audio_platform_info_intcodec.xml

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ 
        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -242,9 +244,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

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

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

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

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

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