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

Commit 87df8056 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dd11601b on remote branch 

Change-Id: Ia0d7fa0ceaafbe17effbe679de70813483d23f80
parents 8df7e993 dd11601b

configs/atoll/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
                <route type="mix" sink="usb_surround_sound"

                       sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="record_24"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>

                <route type="mix" sink="mmap_no_irq_in"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="BT A2DP Out"

configs/atoll/sound_trigger_mixer_paths.xml

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

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

<!--- Copyright (c) 2014-2020, 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    -->
@@ -82,6 +82,8 @@ 
    <ctl name="EC Reference Bit Format" value="0"/>

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

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="LPI Enable" value="0" />

    <ctl name="ADC2 Volume" value="12" />



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

        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -149,66 +151,82 @@ 


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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -264,7 +282,6 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

        <ctl name="ADC2 Volume" value="62" />

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

        <ctl name="ADC2 MUX" value="INP2" />

    </path>

configs/atoll/sound_trigger_mixer_paths_qrd.xml

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

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

<!--- Copyright (c) 2014-2020, 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    -->
@@ -87,6 +87,8 @@ 
    <ctl name="ADC2 MUX" value="ZERO" />

    <ctl name="ADC3 MUX" value="ZERO" />

    <ctl name="ADC4 MUX" value="ZERO" />

    <ctl name="LPI Enable" value="0" />

    <ctl name="ADC2 Volume" value="12" />



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

        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -154,66 +156,82 @@ 


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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -265,7 +283,6 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

        <ctl name="ADC2 Volume" value="62" />

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

        <ctl name="ADC2 MUX" value="INP2" />

    </path>

configs/atoll/sound_trigger_mixer_paths_wcd937x.xml

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

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

<!--- Copyright (c) 2019-2020, 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    -->
@@ -82,6 +82,8 @@ 
    <ctl name="EC Reference Bit Format" value="0"/>

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

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="LPI Enable" value="0" />

    <ctl name="ADC2 Volume" value="12" />



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

        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -149,66 +151,82 @@ 


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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="1" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



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

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

        <ctl name="LPI Enable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -264,7 +282,6 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

        <ctl name="ADC2 Volume" value="62" />

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

        <ctl name="ADC2 MUX" value="INP2" />

    </path>

configs/bengal/audio_platform_info_scubaidp.xml

0 → 100644
+392 −0

File added.

Preview size limit exceeded, changes collapsed.