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

Commit b1e611c9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: Set the fourth channel of qmic path same as the third"

parents 0aa0921a ce928a7b

configs/sdm660/mixer_paths_skus.xml

+1 −1
Original line number Diff line number Diff line
@@ -2516,7 +2516,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC5" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC1" />

        <ctl name="DMIC MUX8" value="DMIC5" />

    </path>



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

configs/sdm660/sound_trigger_mixer_paths_wcd9335.xml

+114 −4
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ 
    <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />

    <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />

    <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />

    <ctl name="LSM1 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM2 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM3 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM4 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM5 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM6 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM7 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM8 Mixer SLIMBUS_0_TX" value="0" />

    <ctl name="LSM1 Port" value="None" />

    <ctl name="LSM2 Port" value="None" />

    <ctl name="LSM3 Port" value="None" />
@@ -45,6 +53,7 @@ 
    <ctl name="LSM7 Port" value="None" />

    <ctl name="LSM8 Port" value="None" />

    <ctl name="SLIMBUS_5_TX LSM Function" value="None" />

    <ctl name="SLIMBUS_0_TX LSM Function" value="None" />

    <ctl name="MADONOFF Switch" value="0" />

    <ctl name="MAD Input" value="DMIC1" />

    <ctl name="MAD_BROADCAST Switch" value="0" />
@@ -52,10 +61,27 @@ 
    <ctl name="AIF4_MAD Mixer SLIM TX12" value="0" />

    <ctl name="AIF4_MAD Mixer SLIM TX13" value="0" />

    <ctl name="CPE AFE MAD Enable" value="0"/>

    <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>

    <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />

    <ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />

    <ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>

    <ctl name="SLIM TX5 MUX" value="ZERO" />

    <ctl name="SLIM TX6 MUX" value="ZERO" />

    <ctl name="SLIM TX7 MUX" value="ZERO" />

    <ctl name="SLIM TX8 MUX" value="ZERO" />

    <ctl name="ADC MUX5" value="AMIC" />

    <ctl name="ADC MUX6" value="AMIC" />

    <ctl name="ADC MUX7" value="AMIC" />

    <ctl name="ADC MUX8" value="AMIC" />

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

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

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

    <ctl name="DMIC MUX8" value="ZERO" />

    <ctl name="CLK MODE" value="EXTERNAL" />

    <ctl name="EC BUF MUX INP" value="ZERO" />

    <ctl name="ADC MUX1" value="DMIC" />

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

    <ctl name="IIR0 INP0 MUX" value="ZERO" />



    <path name="listen-voice-wakeup-1">

        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -99,11 +125,59 @@ 
        <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-1 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM1 Port" value="ADM_LSM_TX" />

        <ctl name="LSM1 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-2 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM2 Port" value="ADM_LSM_TX" />

        <ctl name="LSM2 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-3 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM3 Port" value="ADM_LSM_TX" />

        <ctl name="LSM3 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-4 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM4 Port" value="ADM_LSM_TX" />

        <ctl name="LSM4 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-5 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM5 Port" value="ADM_LSM_TX" />

        <ctl name="LSM5 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-6 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM6 Port" value="ADM_LSM_TX" />

        <ctl name="LSM6 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-7 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM7 Port" value="ADM_LSM_TX" />

        <ctl name="LSM7 Mixer SLIMBUS_0_TX" value="1" />

    </path>



    <path name="listen-voice-wakeup-8 preproc">

        <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />

        <ctl name="LSM8 Port" value="ADM_LSM_TX" />

        <ctl name="LSM8 Mixer SLIMBUS_0_TX" value="1" />

    </path>



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

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

        <ctl name="TX13 INP MUX" value="CPE_TX_PP" />

        <ctl name="AIF4_MAD Mixer SLIM TX13" value="1" />

        <ctl name="MAD Input" value="DMIC2" />

        <ctl name="MAD Input" value="DMIC3" />

        <ctl name="CPE AFE MAD Enable" value="1"/>

    </path>
@@ -111,14 +185,14 @@ 
        <ctl name="CLK MODE" value="INTERNAL" />

        <ctl name="EC BUF MUX INP" value="DEC1" />

        <ctl name="ADC MUX1" value="DMIC" />

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

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

    </path>



    <!-- path name used for low bandwidth FTRT codec interface -->

    <path name="listen-cpe-handset-mic low-speed-intf">

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

        <ctl name="AIF4_MAD Mixer SLIM TX12" value="1" />

        <ctl name="MAD Input" value="DMIC2" />

        <ctl name="MAD Input" value="DMIC3" />

        <ctl name="CPE AFE MAD Enable" value="1"/>

    </path>
@@ -126,7 +200,43 @@ 
        <ctl name="MAD_BROADCAST Switch" value="1" />

        <ctl name="TX13 INP MUX" value="MAD_BRDCST" />

        <ctl name="AIF4_MAD Mixer SLIM TX13" value="1" />

        <ctl name="MAD Input" value="DMIC2" />

        <ctl name="MAD Input" value="DMIC3" />

    </path>



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

       <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>

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

       <ctl name="SLIM TX7 MUX" value="DEC7" />

       <ctl name="ADC MUX7" value="DMIC" />

       <ctl name="DMIC MUX7" value="DMIC3" />

       <ctl name="IIR0 INP0 MUX" value="DEC7" />

    </path>



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

       <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />

       <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />

       <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />

       <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />

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

       <ctl name="SLIM TX5 MUX" value="DEC5" />

       <ctl name="ADC MUX5" value="DMIC" />

       <ctl name="DMIC MUX5" value="DMIC0" />

       <ctl name="SLIM TX6 MUX" value="DEC6" />

       <ctl name="ADC MUX6" value="DMIC" />

       <ctl name="DMIC MUX6" value="DMIC3" />

       <ctl name="SLIM TX7 MUX" value="DEC7" />

       <ctl name="ADC MUX7" value="DMIC" />

       <ctl name="DMIC MUX7" value="DMIC5" />

       <ctl name="SLIM TX8 MUX" value="DEC8" />

       <ctl name="ADC MUX8" value="DMIC" />

       <ctl name="DMIC MUX8" value="DMIC5" />

   </path>



   <path name="echo-reference">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX"/>

        <ctl name="EC Reference Channels" value="One"/>

        <ctl name="EC Reference Bit Format" value="S16_LE"/>

        <ctl name="EC Reference SampleRate" value="48000"/>

   </path>



</mixer>