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

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

Merge "configs: Audio bringup changes for bengal"

parents 059421d1 b1926f8f

configs/bengal/audio_platform_info_intcodec.xml

+3 −2
Original line number Diff line number Diff line
@@ -113,13 +113,14 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

         <device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="RX_CDC_DMA_RX_1"/>
@@ -127,7 +128,7 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="RX_CDC_DMA_RX_1"/>

configs/bengal/mixer_paths.xml

+154 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
    <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia13" value="0" />

    <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia14" value="0" />

    <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia15" value="0" />

    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0" />

    <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="0" />

    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />

    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />

    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" />
@@ -129,6 +129,8 @@ 
    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />

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

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

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

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

    <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
@@ -175,6 +177,7 @@ 
    <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="0" />

    <!-- Multimode Voice1 BTSCO -->

    <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
@@ -191,6 +194,7 @@ 
    <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" />

    <!-- Multimode Voice2 BTSCO -->

    <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" />
@@ -445,6 +449,10 @@ 
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1" />

    </path>



    <path name="echo-reference-voip handset">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

    </path>



    <path name="echo-reference-voip headphones">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

    </path>
@@ -466,6 +474,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="deep-buffer-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="deep-buffer-playback speaker-protected">

        <path name="deep-buffer-playback" />

    </path>
@@ -527,6 +539,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="deep-buffer-playback headset">

        <path name="deep-buffer-playback headphones" />

    </path>



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

        <path name="deep-buffer-playback headphones" />

        <path name="deep-buffer-playback" />
@@ -571,6 +587,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-protected">

        <path name="low-latency-playback" />

    </path>
@@ -632,10 +652,15 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback headset">

        <path name="low-latency-playback headphones" />

    </path>



    <path name="low-latency-playback speaker-and-headphones">

        <path name="low-latency-playback headphones" />

        <path name="low-latency-playback" />

    </path>



    <path name="low-latency-playback resume">

        <ctl name="MultiMedia5_RX QOS Vote" value="Enable" />

    </path>
@@ -679,6 +704,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia8" value="1" />

    </path>



    <path name="audio-ull-playback handset">

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

    </path>



    <path name="audio-ull-playback speaker-protected">

        <path name="audio-ull-playback" />

    </path>
@@ -691,6 +720,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>



    <path name="audio-ull-playback headset">

        <path name="audio-ull-playback headphones" />

    </path>



    <path name="audio-ull-playback speaker-and-headphones">

        <path name="audio-ull-playback" />

        <path name="audio-ull-playback headphones" />
@@ -782,6 +815,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback speaker-protected">

        <path name="compress-offload-playback" />

    </path>
@@ -847,6 +884,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback headset">

        <path name="compress-offload-playback headphones" />

    </path>



    <path name="compress-offload-playback headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -899,6 +940,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />

    </path>
@@ -952,6 +997,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 headset">

        <path name="compress-offload-playback2 headphones" />

    </path>



    <path name="compress-offload-playback2 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />
@@ -1005,6 +1054,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="compress-offload-playback3 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="compress-offload-playback3 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />

    </path>
@@ -1058,6 +1111,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="compress-offload-playback3 headset">

        <path name="compress-offload-playback3 headphones" />

    </path>



    <path name="compress-offload-playback3 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -1110,6 +1167,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia11" value="1" />

    </path>



    <path name="compress-offload-playback4 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>



    <path name="compress-offload-playback4 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />

    </path>
@@ -1163,6 +1224,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>



    <path name="compress-offload-playback4 headset">

        <path name="compress-offload-playback4 headphones" />

    </path>



    <path name="compress-offload-playback4 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -1215,6 +1280,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />

    </path>
@@ -1268,6 +1337,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 headset">

        <path name="compress-offload-playback5 headphones" />

    </path>



    <path name="compress-offload-playback5 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -1320,6 +1393,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />

    </path>
@@ -1373,6 +1450,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 headset">

        <path name="compress-offload-playback6 headphones" />

    </path>



    <path name="compress-offload-playback6 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -1425,6 +1506,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia14" value="1" />

    </path>



    <path name="compress-offload-playback7 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>



    <path name="compress-offload-playback7 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />

    </path>
@@ -1478,6 +1563,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>



    <path name="compress-offload-playback7 headset">

        <path name="compress-offload-playback7 headphones" />

    </path>



    <path name="compress-offload-playback7 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -1530,6 +1619,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia15" value="1" />

    </path>



    <path name="compress-offload-playback8 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>



    <path name="compress-offload-playback8 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />

    </path>
@@ -1583,6 +1676,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>



    <path name="compress-offload-playback8 headset">

        <path name="compress-offload-playback8 headphones" />

    </path>



    <path name="compress-offload-playback8 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>
@@ -1635,6 +1732,10 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="compress-offload-playback9 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="compress-offload-playback9 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />

    </path>
@@ -1688,6 +1789,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="compress-offload-playback9 headset">

        <path name="compress-offload-playback9 headphones" />

    </path>



    <path name="compress-offload-playback9 headphones-44.1">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>
@@ -1848,6 +1953,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="1" />

    </path>



    <path name="play-fm headset">

        <path name="play-fm headphones" />

    </path>



    <path name="incall-rec-uplink">

        <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />

    </path>
@@ -2013,6 +2122,11 @@ 
        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

    </path>



    <path name="compress-voip-call handset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

    </path>



    <path name="compress-voip-call bt-a2dp">

        <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
@@ -2023,6 +2137,10 @@ 
        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

    </path>



    <path name="compress-voip-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_4_Voip" value="1" />

    </path>



    <path name="compress-voip-call bt-sco">

        <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
@@ -2058,11 +2176,21 @@ 
        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call handset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call headphones">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call bt-sco">

        <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="1" />
@@ -2107,11 +2235,21 @@ 
        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call handset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call headphones">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call headset">

        <ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call bt-sco">

        <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="1" />
@@ -2156,10 +2294,18 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-playback-voip handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-playback-voip headphones">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-playback-voip headset">

        <path name="audio-playback-voip headphones" />

    </path>



    <path name="audio-playback-voip bt-sco">

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

    </path>
@@ -2451,6 +2597,10 @@ 
        <path name="headphones" />

    </path>



    <path name="voice-headset">

        <path name="headphones" />

    </path>



    <path name="voice-line">

        <path name="voice-headphones" />

    </path>
@@ -2997,6 +3147,9 @@ 
        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="1" />

    </path>



   <path name="mmap-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>

    <path name="mmap-playback headphones">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>

configs/bengal/sound_trigger_platform_info.xml

+55 −9
Original line number Diff line number Diff line
@@ -49,7 +49,10 @@ 
        <param backend_dai_name="VA_CDC_DMA_TX_0" />

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

        <param dedicated_sva_path="true" />

        <param dedicated_headset_path="false" />

        <param platform_lpi_enable="true" />

        <param enable_debug_dumps="false" />

        <param support_non_lpi_without_ec="false" />

    </common_config>

    <acdb_ids>

        <param DEVICE_HANDSET_MIC_APE="100" />
@@ -72,14 +75,14 @@ 
    <sound_model_config>

        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />

        <param execution_type="ADSP" />

        <param library="libsmwrapper.so" />

        <param merge_first_stage_sound_models="false" />

        <param max_ape_phrases="20" />

        <param max_ape_users="10" />

        <!-- Profile specific data which the algorithm can support -->

        <param sample_rate="16000" />

        <param bit_width="16" />

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



        <param dam_token_id="1"/>

        <arm_ss_usecase>

            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->

            <param sm_detection_type= "KEYWORD_DETECTION" />
@@ -97,6 +100,14 @@ 
            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_usecase>

        <arm_ss_usecase>

            <param sm_detection_type= "KEYWORD_DETECTION" />

            <param sm_id="0x8" />

            <param module_lib="libcapiv2svarnn.so"/>

            <param sample_rate="16000"/>

            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_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.
@@ -109,11 +120,47 @@ 
            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->

            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->

            <!-- is FFECNS -->

            <param fluence_type="FLUENCE_TMIC" />

            <param fluence_type="FLUENCE_DMIC" />

            <param execution_mode="ADSP" />

            <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->

            <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->

            <!-- must be present with this mode type to handle barge-in. -->

            <!-- NON_LPI: If another lsm_usecase is present with this mode -->

            <!-- type, it will be used for non-LPI non-barge-in usecases. -->

            <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->

            <!-- LPI: This mode type will be used for LPI usecases. -->

            <param lpi_mode="NON_LPI_BARGE_IN" />

            <param app_type="2" /> <!-- app type used in ACDB -->

            <param in_channels="3"/> <!-- Module input channels -->

            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />

            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />

            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />

            <param operation_mode_ids="0x00012C1C, 0x0, 0x00012C02" />

            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />

            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />

            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />

            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />

        </lsm_usecase>

        <lsm_usecase>

            <param capture_device="HANDSET" />

            <!-- 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="FFECNS" />

            <!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC"   -->

            <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->

            <!-- is FFECNS -->

            <param fluence_type="FLUENCE_DMIC" />

            <param execution_mode="ADSP" />

            <!-- lpi_mode: "NON_LPI_BARGE_IN", "NON_LPI", "LPI" -->

            <!-- NON_LPI_BARGE_IN: Default non-LPI mode type. lsm_usecase -->

            <!-- must be present with this mode type to handle barge-in. -->

            <!-- NON_LPI: If another lsm_usecase is present with this mode -->

            <!-- type, it will be used for non-LPI non-barge-in usecases. -->

            <!-- If not present, NON_LPI_BARGE_IN mode type will be used. -->

            <!-- LPI: This mode type will be used for LPI usecases. -->

            <param lpi_mode="LPI" />

            <param app_type="2" /> <!-- app type used in ACDB -->

            <param in_channels="5"/> <!-- Module input channels -->

            <param in_channels_lpi="3"/>

            <param in_channels="1"/> <!-- Module input channels -->

            <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />

            <param unload_sound_model_ids="0x00012C1C, 0x0, 0x00012C15" />

            <param confidence_levels_ids="0x00012C1C, 0x0, 0x00012C07" />
@@ -121,6 +168,7 @@ 
            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />

            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />

            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />

            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />

        </lsm_usecase>

        <lsm_usecase>

            <param capture_device="HEADSET" />
@@ -136,6 +184,7 @@ 
            <param polling_enable_ids="0x00012C1C, 0x0, 0x00012C1B" />

            <param custom_config_ids="0x00012C1C, 0x0, 0x00012C20" />

            <param det_event_type_ids="0x00012C1C, 0x0, 0x00012C2C" />

            <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />

        </lsm_usecase>



        <!-- format: "ADPCM_packet" or "PCM_packet" !-->
@@ -150,7 +199,6 @@ 
    <sound_model_config>

        <param vendor_uuid="876c1b46-9d4d-40cc-a4fd-4d5ec7a80e47" />

        <param execution_type="ADSP" />

        <param library="libsmwrapper.so" />

        <param max_ape_phrases="1" />

        <param max_ape_users="1" />

        <!-- Profile specific data which the algorithm can support -->
@@ -205,7 +253,6 @@ 
    <sound_model_config>

        <param vendor_uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" />

        <param execution_type="ADSP" />

        <param library="none" />

        <param max_ape_phrases="1" />

        <param max_ape_users="1" />

        <!-- Profile specific data which the algorithm can support -->
@@ -258,7 +305,6 @@ 
    <sound_model_config>

        <param vendor_uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" />

        <param execution_type="ADSP" />

        <param library="none" />

        <param max_ape_phrases="1" />

        <param max_ape_users="1" />

        <!-- Profile specific data which the algorithm can support -->
@@ -314,6 +360,6 @@ 
        <param app_type="69947" />

        <param sample_rate="16000" />

        <param bit_width="16" />

        <param out_channels="5"/>

        <param out_channels="3"/>

    </adm_config>

</sound_trigger_platform_info>