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

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

Merge "configs: correct tx channel order for dmic/tmic/qmic"

parents 7e1f7c9b 16a7f730

configs/kona/mixer_paths.xml

+19 −19
Original line number Diff line number Diff line
@@ -2674,10 +2674,10 @@ 
    <!-- Dual MIC devices -->

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

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

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

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

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

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

    </path>



    <path name="speaker-dmic-endfire">
@@ -2751,10 +2751,10 @@ 
    </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 DMIC MUX2" value="DMIC4" />

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

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

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

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

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

    </path>



    <path name="dmic-broadside">
@@ -2769,22 +2769,22 @@ 
    <!-- Tri MIC devices -->

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

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

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

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

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

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

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

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

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

    </path>



    <path name="speaker-tmic">

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

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

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

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

        <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="voice-speaker-tmic">
@@ -2794,14 +2794,14 @@ 
    <!-- Quad MIC devices -->

    <path name="speaker-qmic">

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

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

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

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

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

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

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

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

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

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

    </path>



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

configs/kona/mixer_paths_qrd.xml

+19 −19
Original line number Diff line number Diff line
@@ -2935,18 +2935,18 @@ 
    <!-- Dual MIC devices -->

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

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

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

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

        <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 DEC2" value="1" />

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

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

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

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

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

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

    </path>



    <path name="dmic-endfire">
@@ -3057,22 +3057,22 @@ 


    <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_AIF1_CAP Mixer DEC1" value="1" />

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

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

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

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

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

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

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

    </path>



    <path name="speaker-tmic">

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

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

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

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

        <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="voice-speaker-tmic">
@@ -3081,14 +3081,14 @@ 


    <path name="speaker-qmic">

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

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

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

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

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

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

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

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

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

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

    </path>



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

configs/lito/mixer_paths.xml

+22 −22
Original line number Diff line number Diff line
@@ -2958,18 +2958,18 @@ 
    <!-- Dual MIC devices -->

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

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

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

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

        <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 DEC2" value="1" />

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

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

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

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

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

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

    </path>



    <path name="dmic-endfire">
@@ -3035,10 +3035,10 @@ 
    </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 DMIC MUX2" value="DMIC4" />

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

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

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

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

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

    </path>



    <path name="dmic-broadside">
@@ -3053,22 +3053,22 @@ 
    <!-- Tri MIC devices -->

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

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

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

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

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

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

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

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

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

    </path>



    <path name="speaker-tmic">

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

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

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

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

        <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="voice-speaker-tmic">
@@ -3078,14 +3078,14 @@ 
    <!-- Quad MIC devices -->

    <path name="speaker-qmic">

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

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

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

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

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

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

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

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

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

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

    </path>



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

configs/lito/mixer_paths_qrd.xml

+19 −19
Original line number Diff line number Diff line
@@ -3171,18 +3171,18 @@ 
    <!-- Dual MIC devices -->

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

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

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

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

        <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 DEC2" value="1" />

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

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

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

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

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

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

    </path>



    <path name="dmic-endfire">
@@ -3293,22 +3293,22 @@ 


    <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_AIF1_CAP Mixer DEC1" value="1" />

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

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

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

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

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

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

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

    </path>



    <path name="speaker-tmic">

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

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

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

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

        <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="voice-speaker-tmic">
@@ -3317,14 +3317,14 @@ 


    <path name="speaker-qmic">

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

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

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

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

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

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

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

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

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

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

    </path>



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