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

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

Merge "configs: update channel order for speaker dmic"

parents 7cae5f9e bbc535ae

configs/lahaina/mixer_paths.xml

+8 −8
Original line number Diff line number Diff line
@@ -2957,14 +2957,14 @@ 


    <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 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 DEC1 MUX" value="SWR_MIC" />

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

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

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

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

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

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

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

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

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

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

    </path>
@@ -3036,14 +3036,14 @@ 
    </path>

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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX2" 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 HIFI PortMap" value="SWRM_TX1_CH4" />

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

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

    </path>

configs/lahaina/mixer_paths_cdp.xml

+8 −8
Original line number Diff line number Diff line
@@ -2834,14 +2834,14 @@ 


    <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 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 DEC1 MUX" value="SWR_MIC" />

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

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

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

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

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

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

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

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

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

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

    </path>
@@ -2913,14 +2913,14 @@ 
    </path>

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

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

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

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

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

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

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

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

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

        <ctl name="TX SMIC MUX2" 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 HIFI PortMap" value="SWRM_TX1_CH4" />

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

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

    </path>