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

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

Merge "configs: shima: Use TX3 SWR master port instead of TX2 in TMIC and QMIC recording"

parents 88f256d4 c43d2dd3

configs/lahaina/audio_platform_info_shimaidp.xml

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
        <!-- followed by perf lock options                             -->

        <param key="perf_lock_opts" value="4, 0x40400000, 0x1, 0x40C00000, 0x1"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="input_mic_max_count" value="3"/>

        <param key="input_mic_max_count" value="4"/>

        <param key="true_32_bit" value="true"/>

        <param key="hifi_filter" value="false"/>

        <!-- In the below value string, the value indicates sidetone gain in dB -->

configs/lahaina/mixer_paths_shimaidp.xml

+36 −35
Original line number Diff line number Diff line
@@ -2912,7 +2912,7 @@ 
        <ctl name="TX DEC1 MUX" value="SWR_MIC" />

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC1" />

        <ctl name="TX SMIC MUX1" value="SWR_MIC5" />

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

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

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

        <ctl name="ADC2_MIXER Switch" value="1" />
@@ -2921,7 +2921,7 @@ 
        <ctl name="HDR12 MUX" value="NO_HDR12" />

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

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

        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

    </path>



    <path name="dmic-endfire">
@@ -2994,14 +2994,14 @@ 
        <ctl name="TX DEC1 MUX" value="SWR_MIC" />

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />

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

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

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

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

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

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

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

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

        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

    </path>



    <path name="dmic-broadside">
@@ -3016,24 +3016,25 @@ 
    <!-- Tri MIC devices -->

    <path name="three-mic">

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

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

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

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC1" />

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

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

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

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

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

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

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

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

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC9" />

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC8" />

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

        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />

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

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

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

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

        <ctl name="HDR12 MUX" value="NO_HDR12" />

        <ctl name="HDR34 MUX" value="NO_HDR34" />

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

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

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

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

    </path>



    <path name="speaker-tmic">
@@ -3047,31 +3048,31 @@ 
    <!-- Quad MIC devices -->

    <path name="speaker-qmic">

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

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

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

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

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC1" />

        <ctl name="TX SMIC MUX4" value="SWR_MIC4" />

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

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

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

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

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

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

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

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

        <ctl name="ADC4 ChMap" value="SWRM_TX2_CH2" />

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

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

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

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

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC9" />

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

        <ctl name="TX SMIC MUX3" value="SWR_MIC8" />

        <ctl name="TX SMIC MUX4" value="SWR_MIC1" />

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

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

        <ctl name="HDR12 MUX" value="NO_HDR12" />

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

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

        <ctl name="ADC3 ChMap" value="SWRM_TX2_CH1" />

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

        <ctl name="HDR12 MUX" value="NO_HDR12" />

        <ctl name="HDR34 MUX" value="NO_HDR34" />

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

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

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

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

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

    </path>



    <path name="speaker-qmic-liquid">

configs/lahaina/sound_trigger_mixer_paths_shimaidp.xml

+32 −21
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ 
    <ctl name="TX1 MODE" value="ADC_LP" />

    <ctl name="TX2 MODE" value="ADC_LP" />

    <ctl name="TX3 MODE" value="ADC_LP" />

    <ctl name="ADC1 ChMap" value="ZERO" />

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

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

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



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

        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -276,21 +280,24 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />

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

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

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

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

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

        <ctl name="VA SMIC MUX1" value="SWR_MIC1" />

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

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

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

        <ctl name="VA SMIC MUX2" value="SWR_MIC2" />

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

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

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

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

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

        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />

        <ctl name="VA SMIC MUX2" value="SWR_MIC8" />

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

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

        <ctl name="HDR12 MUX" value="NO_HDR12" />

        <ctl name="HDR34 MUX" value="NO_HDR34" />

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

        <ctl name="ADC3 ChMap" value="SWRM_TX1_CH3" />

        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

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

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

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

    </path>



    <path name="listen-ape-handset-qmic">
@@ -300,24 +307,28 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />

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

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

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

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

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

        <ctl name="VA SMIC MUX1" value="SWR_MIC1" />

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

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

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

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

        <ctl name="VA SMIC MUX3" value="SWR_MIC3" />

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

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

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

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

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

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

        <ctl name="VA SMIC MUX1" value="SWR_MIC0" />

        <ctl name="VA SMIC MUX2" value="SWR_MIC8" />

        <ctl name="VA SMIC MUX3" value="SWR_MIC1" />

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

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

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

        <ctl name="VA SMIC MUX2" value="SWR_MIC2" />

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

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

        <ctl name="ADC1 ChMap" value="SWRM_TX1_CH1" />

        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />

        <ctl name="ADC3 ChMap" value="SWRM_TX1_CH3" />

        <ctl name="ADC4 ChMap" value="SWRM_TX1_CH4" />

        <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" />

        <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />

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

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

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

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

    </path>



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