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

Commit 0cdfe375 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

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

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2009985   Iaec94b7220cdaa243d4b616fb727aae7179539d2   audio: hal: Add AVD Drift Query support
2011667   I0630117d39fb8ad96dad97fcc068e861be9c2dc1   configs: Support for 3-MIC FluencePro on msm8998
2005890   Ideabfa4b58a9f65bd847556f5ffe2f60540eb299   hal: Add sound card support for sdm630 qrd skush
2005890   I2ea79a305836b925d539fe1ed2d296bb4c7732be   config: audio bringup changes for sdm630 qrd
1107422   I9e90be203b86e20466a946f5b5726ccbd95bfec3   hal : non-ms12 fmt support in qaf
2012649   I901a66fb3b99cbd532ed8fad14c9bef0e1b4ed8b   configs: msm8998: fix incorrect ctl name for speaker-vba
2008319   Ia75d94055fa14d3612fced82e52885a7b1df71d5   configs: msm8998: change mic assignment and update a2dp

Change-Id: I3e2a16ad4cd1f4c4f914215faa3a4c41575bdf30
CRs-Fixed: 2008319, 1107422, 2009985, 2011667, 2005890, 2012649
parents 0d1507a8 fac89025

configs/msm8998/mixer_paths_skuk.xml

+8 −11
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ 
    </path>



    <path name="speaker-mic">

        <path name="dmic2" />

        <path name="dmic1" />

    </path>



    <path name="speaker-mic-liquid">
@@ -1891,13 +1891,13 @@ 
        <ctl name="SLIM_0_TX Channels" value="Three" />

        <ctl name="CDC_IF TX0 MUX" value="DEC0" />

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

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

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

        <ctl name="CDC_IF TX1 MUX" value="DEC1" />

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

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

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

        <ctl name="CDC_IF TX2 MUX" value="DEC2" />

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

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

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

    </path>



    <path name="anc-handset">
@@ -2151,11 +2151,8 @@ 
        <ctl name="DMIC MUX8" value="DMIC4" />

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

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

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

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

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

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

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

        <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />

    </path>



    <!-- Dual MIC devices -->
@@ -2275,10 +2272,10 @@ 
        <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="DMIC0" />

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

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

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

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

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

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

        <ctl name="DMIC MUX7" value="DMIC2" />
@@ -2410,7 +2407,7 @@ 
    </path>



    <path name="audio-ull-playback bt-a2dp">

        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia3" value="1" />

        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />

    </path>



    <path name="deep-buffer-playback speaker-and-bt-a2dp">

configs/msm8998/mixer_paths_tasha.xml

+2 −2
Original line number Diff line number Diff line
@@ -1986,7 +1986,7 @@ 


   <path name="speaker-vbat-mono-2">

       <path name="speaker-mono-2" />

       <ctl name="RX INT8 VBAT SPKRL VBAT Enable" value="1" />

       <ctl name="RX INT8 VBAT SPKRR VBAT Enable" value="1" />

   </path>



   <path name="speaker-vbat">
@@ -2082,7 +2082,7 @@ 


    <path name="voice-speaker-2-protected-vbat">

        <path name="voice-speaker-2-protected" />

        <ctl name="RX INT8 VBAT SPKRL VBAT Enable" value="1" />

        <ctl name="RX INT8 VBAT SPKRR VBAT Enable" value="1" />

    </path>



    <path name="handset">

configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml

+108 −0
Original line number Diff line number Diff line
@@ -56,48 +56,120 @@ 
    <ctl name="EC BUF MUX INP" value="ZERO" />

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

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

    <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="CDC_IF TX5 MUX" value="ZERO" />

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

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

    <ctl name="CDC_IF 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="IIR0 INP0 MUX" value="ZERO" />



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

    </path>



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

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

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

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

        <ctl name="MAD_SEL MUX" value="SPE" />
@@ -136,4 +208,40 @@ 
        <ctl name="AIF4_MAD Mixer SLIM TX13" value="1" />

    </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="CDC_IF TX7 MUX" value="DEC7" />

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

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

        <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="CDC_IF TX5 MUX" value="DEC5" />

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

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

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

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

        <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="CDC_IF 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="Two"/>

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

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

    </path>



</mixer>

configs/msm8998/sound_trigger_platform_info.xml

+43 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.       -->

<!--- Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.       -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -33,11 +33,18 @@ 
        <param max_ape_sessions="8" />

        <param enable_failure_detection="false" />

        <param support_device_switch="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="SLIM_0_TX" />

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

        <param backend_dai_name="SLIMBUS_0_TX" />

    </common_config>

    <acdb_ids>

        <param DEVICE_HANDSET_MIC_APE="100" />

        <param DEVICE_HANDSET_MIC_CPE="128" />

        <param DEVICE_HANDSET_MIC_ECPP_CPE="128" />

        <param DEVICE_HANDSET_MIC_PP_APE="135" />

        <param DEVICE_HANDSET_QMIC_APE="137" />

        <param DEVICE_HEADSET_MIC_CPE="139" />

    </acdb_ids>

    <!-- Multiple sound_model_config tags can be listed, each with unique   -->
@@ -59,6 +66,9 @@ 
        <!-- adm_cfg_profile should match with the one defined under adm_config -->

        <!-- Set it to NONE if LSM directly connects to AFE -->

        <param adm_cfg_profile="NONE" />

        <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->

        <!-- param value is valid when adm_cfg_profile="FLUENCE" -->

        <param fluence_type="FLUENCE_QMIC" />

        <gcs_usecase>

            <param uid="0x1" />

            <!-- module_id, instance_id, param_id -->
@@ -79,11 +89,25 @@ 
            <param custom_config_ids="0x00012C0D, 0x3, 0x00012C20" />

        </gcs_usecase>

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

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

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

            Extends flexibility to have different ids based on execution type.

            valid execution_type values: "WDSP" "ADSP" -->

        <lsm_usecase>

            <param execution_mode="ADSP" />

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

            <param unload_sound_model_ids="0x00012C0D, 0x00012C15" />

            <param confidence_levels_ids="0x00012C0D, 0x00012C07" />

            <param operation_mode_ids="0x00012C0D, 0x00012C02" />

            <param polling_enable_ids="0x00012C0D, 0x00012C1B" />

        </lsm_usecase>



        <lsm_usecase>

            <param execution_mode="WDSP" />

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

            <param unload_sound_model_ids="0x00012C0D, 0x00012C15" />

            <param confidence_levels_ids="0x00012C0D, 0x00012C07" />

            <param operation_mode_ids="0x00012C0D, 0x00012C02" />

        </lsm_usecase>



        <!-- format: "ADPCM_packet" or "PCM_packet" !-->

        <!-- transfer_mode: "FTRT" or "RT" -->
@@ -101,4 +125,17 @@ 
        <param sample_rate="16000" />

        <param bit_width="16" />

    </adm_config>



    <adm_config>

        <param adm_cfg_profile="FLUENCE" />

        <param app_type="69943" />

        <param sample_rate="16000" />

        <param bit_width="16" />

    </adm_config>



    <!-- backend_type tag defines backend type for each device -->

    <!-- Default value is assumed for devices that are not listed here -->

    <backend_type>

        <param DEVICE_HANDSET_MIC_ECPP_CPE="BACKEND_ECPP" />

    </backend_type>

</sound_trigger_platform_info>

configs/sdm660/audio_platform_info_skush.xml

0 → 100644
+197 −0

File added.

Preview size limit exceeded, changes collapsed.