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

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

Merge "configs: lito: Add button click suppression mixer"

parents d77e25ed d05690b3

configs/lito/lito.mk

+2 −0
Original line number Diff line number Diff line
@@ -176,8 +176,10 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/sound_trigger_mixer_paths_cdp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_cdp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths_cdp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_cdp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \

    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \

configs/lito/mixer_paths.xml

+34 −31
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ 
    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

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

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

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

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

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
@@ -1987,48 +1988,49 @@ 


    <!-- These are actual sound device specific mixer settings -->

    <path name="amic2">

        <ctl name="TX DEC5 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX5" value="ADC1" />

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

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

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

        <ctl name="TX_AIF2_CAP Mixer DEC5" value="1" />

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

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

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

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

    </path>



    <path name="dmic1">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic2">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

    </path>



    <path name="dmic3">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic4">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic5">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic6">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC5" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC5" />

    </path>



    <path name="speaker">
@@ -2095,7 +2097,7 @@ 
    <path name="sidetone-headphones">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="54" />

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

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

        <ctl name="RX INT0 MIX2 INP" value="SRC0" />

        <ctl name="RX INT1 MIX2 INP" value="SRC0" />

    </path>
@@ -2103,7 +2105,7 @@ 
    <path name="sidetone-handset">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="54" />

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

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

        <ctl name="RX INT2 MIX2 INP" value="SRC0" />

        <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" />

    </path>
@@ -2212,6 +2214,7 @@ 
    </path>



    <path name="headset-mic">

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

        <path name="amic2" />

    </path>
@@ -2356,23 +2359,23 @@ 
    <!-- Dual MIC devices -->

    <path name="handset-dmic-endfire">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC3" />

    </path>



    <path name="speaker-dmic-endfire">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

    </path>



    <path name="dmic-endfire">

        <path name="handset-dmic-endfire" />

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

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

    </path>



    <path name="dmic-endfire-liquid">
@@ -2433,15 +2436,15 @@ 
    </path>

    <path name="speaker-dmic-broadside">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

    </path>



    <path name="dmic-broadside">

        <path name="speaker-dmic-broadside" />

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

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

    </path>



    <path name="voice-speaker-dmic-broadside">
@@ -2451,8 +2454,8 @@ 
    <!-- Tri MIC devices -->

    <path name="three-mic">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
@@ -2461,8 +2464,8 @@ 


    <path name="speaker-tmic">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
@@ -2476,8 +2479,8 @@ 
    <!-- Quad MIC devices -->

    <path name="speaker-qmic">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />

        <ctl name="TX DMIC MUX4" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

configs/lito/mixer_paths_cdp.xml

0 → 100644
+2918 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/lito/mixer_paths_qrd.xml

+38 −35
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ 
    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

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

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

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

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

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
@@ -2332,66 +2333,67 @@ 


    <!-- These are actual sound device specific mixer settings -->

    <path name="amic1">

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

        <ctl name="TX SMIC MUX0" value="ADC0" />

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC0" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="amic2">

        <ctl name="TX DEC5 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX5" value="ADC1" />

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

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

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

        <ctl name="TX_AIF2_CAP Mixer DEC5" value="1" />

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

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

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

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

    </path>





    <path name="amic3">

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

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

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC2" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

    </path>



    <path name="dmic1">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic2">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

    </path>



    <path name="dmic3">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic4">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic5">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic6">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC5" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC5" />

    </path>



    <path name="speaker">
@@ -2431,7 +2433,7 @@ 
    <path name="sidetone-headphones">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="40" />

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

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

        <ctl name="RX INT0 MIX2 INP" value="SRC0" />

        <ctl name="RX INT1 MIX2 INP" value="SRC0" />

    </path>
@@ -2439,7 +2441,7 @@ 
    <path name="sidetone-handset">

        <path name="sidetone-iir" />

        <ctl name="IIR0 INP0 Volume" value="54" />

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

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

        <ctl name="RX INT0 MIX2 INP" value="SRC0" />

    </path>
@@ -2540,6 +2542,7 @@ 
    </path>



    <path name="headset-mic">

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

        <path name="amic2" />

    </path>
@@ -2649,23 +2652,23 @@ 
    <!-- Dual MIC devices -->

    <path name="handset-dmic-endfire">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC3" />

    </path>



    <path name="speaker-dmic-endfire">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

    </path>



    <path name="dmic-endfire">

        <path name="handset-dmic-endfire" />

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

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

    </path>



    <path name="handset-stereo-dmic-ef">
@@ -2702,7 +2705,7 @@ 


    <path name="dmic-broadside">

        <path name="speaker-dmic-broadside" />

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

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

    </path>



    <path name="voice-speaker-dmic-broadside">
@@ -2771,8 +2774,8 @@ 


    <path name="speaker-tmic">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DMIC MUX0" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
@@ -2785,8 +2788,8 @@ 


    <path name="speaker-qmic">

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

         <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

         <ctl name="TX DMIC MUX0" value="DMIC2" />

         <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />

         <ctl name="TX DMIC MUX4" value="DMIC2" />

         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

configs/lito/sound_trigger_mixer_paths_cdp.xml

0 → 100644
+329 −0

File added.

Preview size limit exceeded, changes collapsed.