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

Commit 007fe16c authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.8.4.r1-05200-8x98.0' of... 

Merge tag 'LA.UM.8.4.r1-05200-8x98.0' of https://source.codeaurora.org/quic/la/platform/hardware/qcom/audio into lineage-17.1-caf-msm8998

"LA.UM.8.4.r1-05200-8x98.0"

Conflicts:
	hal/audio_extn/Android.mk

Change-Id: Ida8bfe4658b220b4db0eac7eb0f5ab710ce3c719
parents d6528fb5 cb26b8e5

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

+37 −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,9 @@ 
    <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">

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


    <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">
@@ -266,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

+37 −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,9 @@ 
    <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">

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


    <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">
@@ -268,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/atoll/sound_trigger_mixer_paths_wcd937x.xml

+23 −6
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
    <ctl name="EC Reference Channels" value="Zero"/>

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

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

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



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

        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -148,66 +149,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">
@@ -227,7 +244,7 @@ 
        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />

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

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

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

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

    </path>



    <path name="listen-ape-handset-tmic">
@@ -239,8 +256,8 @@ 
        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />

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

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

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

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

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

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

    </path>



    <path name="listen-ape-handset-qmic">
@@ -253,10 +270,10 @@ 
        <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 DMIC MUX0" value="DMIC0" />

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

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

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

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

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

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

    </path>



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