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

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

Promotion of audio-userspace.lnx.2.2-00039. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2008723   Ifcc9f0f7d6b023455a83a048e48bbcf422a8ca1f   config: modify DMIC configs for sdm660 qrd skus
2009704   I51ac65fc2324383282da273acffb7a0a6a003e92   configs: Use the correct main handset mic.

Change-Id: I47164170050fa46be45609f046a5e926eef693f4
CRs-Fixed: 2009704, 2008723
parents e6f7356b 364826c7

configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml

+4 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
    </path>



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

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

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

        <ctl name="MAD_SEL MUX" value="SPE" />

        <ctl name="MAD_INP MUX" value="MAD" />

        <ctl name="MAD_CPE1 Switch" value="1" />
@@ -116,19 +116,19 @@ 
        <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="DMIC0" />

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

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

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

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

    </path>



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

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

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

        <ctl name="MAD_SEL MUX" value="MSM" />

        <ctl name="MAD_INP MUX" value="MAD" />

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

configs/sdm660/mixer_paths_skus.xml

+15 −15
Original line number Diff line number Diff line
@@ -1966,7 +1966,7 @@ 
    </path>



    <path name="speaker-mic">

        <path name="dmic3" />

        <path name="dmic1" />

    </path>



    <path name="speaker-mic-liquid">
@@ -2017,7 +2017,7 @@ 
    </path>



    <path name="handset-mic">

        <path name="dmic3" />

        <path name="dmic4" />

    </path>



    <path name="handset-mic-db">
@@ -2044,10 +2044,10 @@ 
        <ctl name="DMIC MUX5" value="DMIC0" />

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

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

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

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

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

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

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

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

    </path>



    <path name="anc-handset">
@@ -2366,10 +2366,10 @@ 
        <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />

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

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

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

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

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

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

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

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

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

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

        <ctl name="DMIC MUX7" value="DMIC0" />
@@ -2382,10 +2382,10 @@ 
        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />

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

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

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

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

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

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

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

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

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

    </path>
@@ -2397,7 +2397,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC0" />

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

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

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

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

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

    </path>
@@ -2472,7 +2472,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC0" />

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

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

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

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

    </path>



    <path name="dmic-broadside">
@@ -2493,16 +2493,16 @@ 
        <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="DMIC1" />

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="speaker-qmic-liquid">
@@ -2575,7 +2575,7 @@ 
    </path>



    <path name="voice-tty-vco-handset-mic">

        <path name="dmic3" />

        <path name="dmic4" />

    </path>



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