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

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

Merge "configs: update mixer paths to use swr dmics"

parents 28736ce1 a8f8283b

configs/lahaina/mixer_paths.xml

+79 −33
Original line number Diff line number Diff line
@@ -342,28 +342,28 @@ 
    <ctl name="TX_AIF1_CAP Mixer DEC5" value="0" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ctl name="TX DEC3 MUX" value="MSM_DMIC" />

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

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

    <ctl name="TX SMIC MUX3" value="ZERO" />

    <ctl name="TX DEC4 MUX" value="MSM_DMIC" />

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

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

    <ctl name="TX SMIC MUX4" value="ZERO" />

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

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

    <ctl name="TX DMIC MUX5" value="ZERO" />

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

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

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

    <ctl name="TX DMIC MUX6" value="ZERO" />

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

    <ctl name="TX DEC7 MUX" value="MSM_DMIC" />

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

    <ctl name="TX DMIC MUX7" value="ZERO" />

    <ctl name="TX SMIC MUX7" value="ZERO" />
@@ -2289,32 +2289,36 @@ 
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />

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

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

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

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

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

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

    </path>



    <path name="dmic2">

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

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

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

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

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

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

        <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />

    </path>



    <path name="dmic3">

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

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

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

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

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

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

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

    </path>



    <path name="dmic4">

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

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

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

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

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

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

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

    </path>



    <path name="speaker">
@@ -2414,11 +2418,11 @@ 
    </path>



    <path name="speaker-mic">

        <path name="dmic5" />

        <path name="dmic4" />

    </path>



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

        <path name="dmic5" />

        <path name="dmic4" />

    </path>



    <path name="speaker-mic-sbc">
@@ -2491,7 +2495,7 @@ 
    </path>



    <path name="handset-mic">

        <path name="dmic2" />

        <path name="dmic1" />

    </path>



    <path name="headphones">
@@ -2701,17 +2705,29 @@ 
    <path name="handset-dmic-endfire">

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

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

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

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

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

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

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

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

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

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

    </path>



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

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

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

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

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

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

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

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

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

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

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

    </path>



    <path name="dmic-endfire">
@@ -2796,21 +2812,39 @@ 
    <path name="three-mic">

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

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

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

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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC2" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

    </path>



    <path name="speaker-tmic">

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

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

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

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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC2" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

    </path>



    <path name="voice-speaker-tmic">
@@ -2821,13 +2855,25 @@ 
    <path name="speaker-qmic">

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

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

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

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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC2" />

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

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

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

        <ctl name="TX SMIC MUX4" value="SWR_MIC1" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

        <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />

    </path>



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

configs/lahaina/sound_trigger_mixer_paths.xml

+51 −29
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ 
    <ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />

    <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC2 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC3 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC4 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC5 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC6 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC7 MUX" value="MSM_DMIC" />

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

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

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

    <ctl name="VA DEC3 MUX" value="SWR_MIC" />

    <ctl name="VA DEC4 MUX" value="SWR_MIC" />

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

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

    <ctl name="VA DEC7 MUX" value="SWR_MIC" />

    <ctl name="VA DMIC MUX0" value="ZERO" />

    <ctl name="VA DMIC MUX1" value="ZERO" />

    <ctl name="VA DMIC MUX2" value="ZERO" />
@@ -249,8 +249,10 @@ 


    <path name="listen-ape-handset-mic">

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

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC4" />

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

        <ctl name="VA SMIC MUX0" value="SWR_MIC3" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

    </path>



    <path name="listen-ape-handset-mic-preproc">
@@ -261,10 +263,14 @@ 
        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />

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

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

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC4" />

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

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

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

        <ctl name="VA SMIC MUX0" value="SWR_MIC3" />

        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

    </path>



    <path name="listen-ape-handset-tmic">
@@ -272,12 +278,18 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC4" />

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

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

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

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

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

        <ctl name="VA SMIC MUX0" value="SWR_MIC3" />

        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />

        <ctl name="VA SMIC MUX2" value="SWR_MIC1" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />

    </path>



    <path name="listen-ape-handset-qmic">
@@ -286,23 +298,33 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />

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

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

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC3 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC4" />

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

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

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

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

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

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

        <ctl name="VA DEC3 MUX" value="SWR_MIC" />

        <ctl name="VA SMIC MUX0" value="SWR_MIC3" />

        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />

        <ctl name="VA SMIC MUX2" value="SWR_MIC1" />

        <ctl name="VA SMIC MUX3" value="SWR_MIC2" />

        <ctl name="SWR_MIC3 HIFI PortMap" value="SWRM_TX1_CH4" />

        <ctl name="SWR_MIC0 HIFI PortMap" value="SWRM_TX1_CH1" />

        <ctl name="SWR_MIC1 HIFI PortMap" value="SWRM_TX1_CH2" />

        <ctl name="SWR_MIC2 HIFI PortMap" value="SWRM_TX1_CH3" />

        <ctl name="SWR_MIC3 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC0 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC1 SWR_DMIC_MIXER Switch" value="1" />

        <ctl name="SWR_MIC2 SWR_DMIC_MIXER Switch" value="1" />

    </path>



    <path name="listen-ape-headset-mic">

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

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

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

        <ctl name="VA SMIC MUX0" value="SWR_MIC1" />

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

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

        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

        <ctl name="HDR12 MUX" value="NO_HDR12" />

    </path>



    <path name="echo-reference">