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

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

Merge "config: SVA: Add support for fluence in WDSP mode"

parents 4b9d1b87 1fbb284b

configs/msmsteppe/sound_trigger_mixer_paths.xml

+2 −2
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ 
        <ctl name="TX_DEC3 Volume" value="102" />

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

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

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

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

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

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

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

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

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

    </path>



    <path name="echo-reference">

configs/msmsteppe/sound_trigger_mixer_paths_wcd9340.xml

+12 −12
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ 
        <ctl name= "DMIC MUX0" value="DMIC2" />

        <ctl name= "DEC0 Volume" value="84" />

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

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

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

        <ctl name= "DEC1 Volume" value="84" />

        <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />

        <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
@@ -217,7 +217,7 @@ 
        <ctl name= "DMIC MUX1" value="DMIC0" />

        <ctl name= "DEC1 Volume" value="84" />

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

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

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

        <ctl name= "DEC2 Volume" value="84" />

        <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />

        <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
@@ -237,10 +237,10 @@ 
        <ctl name= "DMIC MUX1" value="DMIC0" />

        <ctl name= "DEC1 Volume" value="84" />

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

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

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

        <ctl name= "DEC2 Volume" value="84" />

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

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

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

        <ctl name= "DEC3 Volume" value="84" />

        <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />

        <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
@@ -298,7 +298,7 @@ 
        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />

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

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

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

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

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

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

        <ctl name="DMIC MUX8" value="DMIC5" />
@@ -312,13 +312,13 @@ 
        <ctl name="SLIM_0_TX Channels" value="Three" />

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

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

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="listen-ape-handset-qmic">
@@ -329,16 +329,16 @@ 
        <ctl name="SLIM_0_TX Channels" value="Four" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="echo-reference">

configs/msmsteppe/sound_trigger_platform_info.xml

+24 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


    </common_config>

    <acdb_ids>

        <!--For internal codec please enable below device-->

        <!--param DEVICE_HANDSET_MIC_APE="130" /-->

        <param DEVICE_HANDSET_MIC_APE="100" />

        <param DEVICE_HANDSET_MIC_CPE="128" />

        <param DEVICE_HANDSET_MIC_ECPP_CPE="128" />
@@ -127,6 +129,28 @@ 
            <param read_rsp_ids="0x00020013, 0x3, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x3, 0x00012C20" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x7" />

            <param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />

            <param load_sound_model_ids="0x00012C0D, 0x7, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x7, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x7, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x7, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x7, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x7, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x7, 0x00012C2A" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x8" />

            <param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />

            <param load_sound_model_ids="0x00012C0D, 0x8, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x8, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x8, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x8, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x8, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x8, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x8, 0x00012C2A" />

        </gcs_usecase>

        <!-- Module and param ids with which the algorithm is integrated

            in non-graphite firmware (note these must come after gcs params)

            Extends flexibility to have different ids based on execution type.