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

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

Merge "hal: kona: update soundtrigger mixer paths and platform info"

parents 12b55bcf ee5139cf

configs/kona/sound_trigger_mixer_paths.xml

+160 −108
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 


<mixer>

    <!-- These are the initial mixer settings -->

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ctl name="LSM3 Port" value="None" />
@@ -44,130 +44,176 @@ 
    <ctl name="LSM6 Port" value="None" />

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

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

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

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

    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />

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

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

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

    <ctl name="TX DEC0 MUX" value="MSM_DMIC" />

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

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

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

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

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

    <ctl name="TX DEC3 MUX" value="MSM_DMIC" />

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

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

    <ctl name="VA_AIF1_CAP Mixer DEC0" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC1" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC2" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC3" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC4" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />

    <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />

    <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC2 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC3 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC4 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC5 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC6 MUX" value="MSM_DMIC" />

    <ctl name="VA DEC7 MUX" value="MSM_DMIC" />

    <ctl name="VA DMIC MUX0" value="ZERO" />

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

    <ctl name="VA DMIC MUX2" value="ZERO" />

    <ctl name="VA DMIC MUX3" value="ZERO" />

    <ctl name="VA DMIC MUX4" value="ZERO" />

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

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

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

    <ctl name="VA SMIC MUX0" value="ZERO" />

    <ctl name="VA SMIC MUX1" value="ZERO" />

    <ctl name="VA SMIC MUX2" value="ZERO" />

    <ctl name="VA SMIC MUX3" value="ZERO" />

    <ctl name="VA SMIC MUX4" value="ZERO" />

    <ctl name="VA SMIC MUX5" value="ZERO" />

    <ctl name="VA SMIC MUX6" value="ZERO" />

    <ctl name="VA SMIC MUX7" value="ZERO" />

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

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

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

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

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

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

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

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



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

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

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

    </path>



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

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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

    </path>



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

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

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

    </path>



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

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

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

        <ctl name="TX_DEC0 Volume" value="102" />

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

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC0" />

    </path>



    <path name="listen-ape-handset-mic-preproc">
@@ -175,42 +221,48 @@ 
    </path>



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

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

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

        <ctl name="TX_DEC0 Volume" value="102" />

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

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

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC0" />

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

    </path>



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

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

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

        <ctl name="TX_DEC0 Volume" value="102" />

        <ctl name="TX_DEC1 Volume" value="102" />

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

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

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

        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three" />

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="VA_AIF1_CAP Mixer DEC5" value="1" />

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC5 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC0" />

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

        <ctl name="VA DMIC MUX5" value="DMIC5" />

    </path>



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

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

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

        <ctl name="TX_DEC0 Volume" value="102" />

        <ctl name="TX_DEC1 Volume" value="102" />

        <ctl name="TX_DEC2 Volume" value="102" />

        <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_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="VA_CDC_DMA_TX_0 Channels" value="Four" />

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

        <ctl name="VA_AIF1_CAP Mixer DEC5" value="1" />

        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />

        <ctl name="VA DEC5 MUX" value="MSM_DMIC" />

        <ctl name="VA DMIC MUX0" value="DMIC0" />

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

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

        <ctl name="VA DMIC MUX5" value="DMIC5" />

    </path>



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

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="VA DEC0 MUX" value="SWR_MIC" />

        <ctl name="VA SMIC MUX0" value="ADC2" />

    </path>



    <path name="echo-reference">

configs/kona/sound_trigger_platform_info.xml

+9 −4
Original line number Diff line number Diff line
@@ -45,18 +45,21 @@ 
        <param transit_to_adsp_on_battery_charging="false" />

        <!-- Below backend params must match with port used in mixer path file -->

        <!-- param used to configure backend sample rate, format and channels -->

        <param backend_port_name="TX_CDC_DMA_TX_3" />

        <param backend_port_name="VA_CDC_DMA_TX_0" />

        <!-- Param used to match and obtain device backend index -->

        <param backend_dai_name="TX_CDC_DMA_TX_3" />

        <param backend_dai_name="VA_CDC_DMA_TX_0" />

        <!-- Param used to indicate if SVA has dedicated SLIM ports -->

        <param dedicated_sva_path="true" />

    </common_config>

    <acdb_ids>

        <param DEVICE_HANDSET_MIC_APE="100" />

        <param DEVICE_HANDSET_TMIC_APE="157" />

        <param DEVICE_HANDSET_MIC_PP_APE="135" />

        <param DEVICE_HANDSET_QMIC_APE="137" />

        <param DEVICE_HANDSET_DMIC_APE="149" />

        <param DEVICE_HANDSET_DMIC_LPI_APE="149" />

        <param DEVICE_HANDSET_TMIC_APE="157" />

        <param DEVICE_HANDSET_TMIC_LPI_APE="157" />

        <param DEVICE_HANDSET_QMIC_APE="137" />

        <param DEVICE_HANDSET_QMIC_LPI_APE="137" />

    </acdb_ids>



    <!-- Multiple sound_model_config tags can be listed, each with unique   -->
@@ -74,6 +77,7 @@ 
        <param sample_rate="16000" />

        <param bit_width="16" />

        <param out_channels="1"/> <!-- Module output channels -->

        <param lpi_enable="true" />



        <arm_ss_usecase>

            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->
@@ -151,6 +155,7 @@ 
        <param sample_rate="16000" />

        <param bit_width="16" />

        <param out_channels="1"/> <!-- Module output channels -->

        <param lpi_enable="true" />

        <!-- 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.