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

Commit 85e05190 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ad0f7144 on remote branch 

Change-Id: Ifd6c310bb95f59c9451419e29078c70cb995bc30
parents 41b55b96 ad0f7144

configs/atoll/mixer_paths.xml

+1 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,7 @@ 
    <!-- VoIP Tx settings -->

    <path name="audio-record-voip">

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

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

    </path>



    <path name="audio-record-voip usb-headset-mic">

configs/atoll/mixer_paths_wcd937x.xml

+1 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,7 @@ 
    <!-- VoIP Tx settings -->

    <path name="audio-record-voip">

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

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

    </path>



    <path name="audio-record-voip usb-headset-mic">

configs/atoll/sound_trigger_mixer_paths.xml

+20 −1
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    -->
@@ -81,6 +81,8 @@ 
    <ctl name="EC Reference Channels" value="Zero"/>

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

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

    <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />

    <ctl name="ADC2_BCS Disable" value="0" />

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



    <path name="listen-voice-wakeup-1">
@@ -150,81 +152,97 @@ 
    <path name="listen-voice-wakeup-1 port">

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

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

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -283,6 +301,7 @@ 
        <ctl name="ADC2 Volume" value="62" />

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

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

        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />

    </path>



    <path name="echo-reference">

configs/atoll/sound_trigger_mixer_paths_qrd.xml

+20 −1
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="VA_DEC0 MODE" value="ADC_DEFAULT" />

    <ctl name="ADC2_BCS Disable" value="0" />

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



    <path name="listen-voice-wakeup-1">
@@ -156,81 +158,97 @@ 
    <path name="listen-voice-wakeup-1 port">

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

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

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" 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" />

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -285,6 +303,7 @@ 
        <ctl name="ADC2 Volume" value="62" />

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

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

        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />

    </path>



    <path name="echo-reference">

configs/kona/sound_trigger_mixer_paths.xml

+20 −1
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    -->
@@ -81,6 +81,8 @@ 
    <ctl name="EC Reference Channels" value="Zero"/>

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

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

    <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />

    <ctl name="ADC2_BCS Disable" value="0" />



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

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


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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="1" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



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

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

        <ctl name="ADC2_BCS Disable" value="0" />

    </path>



    <path name="listen-ape-handset-mic">
@@ -266,6 +284,7 @@ 
        <ctl name="ADC2 Volume" value="62" />

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

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

        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />

    </path>



    <path name="echo-reference">