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

Commit 5f5903bb authored by Xiaojun Sang's avatar Xiaojun Sang Committed by xsangh
Browse files

configs: update microphone assignment after tuning 

Change microphone assignment to follow tuning result.

Change-Id: Ifc10b360fec5ae885a3bf1102b44ac9ba589917f
parent da080f56

configs/holi/audio_platform_info_qrd.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
        <param key="hifi_filter" value="false"/>

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

        <param key="hfp_pcm_dev_id" value="39"/>

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

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

    </config_params>

    <gain_db_to_level_mapping>

        <gain_level_map db="-59" level="5"/>

configs/holi/mixer_paths_qrd.xml

+3 −3
Original line number Diff line number Diff line
@@ -3445,7 +3445,7 @@ 
    </path>



    <path name="speaker-mic">

        <path name="amic3" />

        <path name="amic1" />

    </path>



    <path name="speaker-protected">
@@ -3685,7 +3685,7 @@ 
    </path>



    <!-- Dual MIC devices -->

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

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

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

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

        <ctl name="TX SMIC MUX1" value="SWR_MIC0" />
@@ -3700,7 +3700,7 @@ 
        <ctl name="ADC2 MUX" value="INP3" />

    </path>



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

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

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

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

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

configs/holi/sound_trigger_mixer_paths.xml

+25 −0
Original line number Diff line number Diff line
@@ -270,6 +270,31 @@ 
        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH1" />

    </path>



    <path name="echo-reference">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_1" />

        <ctl name="EC Reference Channels" value="One"/>

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

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

    </path>



    <path name="echo-reference handset">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

        <ctl name="EC Reference Channels" value="One"/>

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

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

    </path>



    <path name="echo-reference headphones">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

        <ctl name="EC Reference Channels" value="Two"/>

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

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

    </path>



    <path name="echo-reference headset">

        <path name="echo-reference headphones" />

    </path>



    <path name="echo-reference a2dp">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

configs/holi/sound_trigger_mixer_paths_qrd.xml

+36 −12
Original line number Diff line number Diff line
@@ -250,12 +250,13 @@ 
    </path>



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

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

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

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="listen-ape-handset-mic-preproc">
@@ -267,16 +268,14 @@ 
        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    </path>



    <path name="listen-ape-handset-tmic">
@@ -318,6 +317,31 @@ 
        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH1" />

    </path>



    <path name="echo-reference">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_1" />

        <ctl name="EC Reference Channels" value="One"/>

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

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

    </path>



    <path name="echo-reference handset">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

        <ctl name="EC Reference Channels" value="One"/>

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

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

    </path>



    <path name="echo-reference headphones">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

        <ctl name="EC Reference Channels" value="Two"/>

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

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

    </path>



    <path name="echo-reference headset">

        <path name="echo-reference headphones" />

    </path>



    <path name="echo-reference a2dp">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

configs/holi/sound_trigger_platform_info.xml

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        <!-- Param used to match and obtain device backend index -->

        <param backend_dai_name="VA_CDC_DMA_TX_0" />

        <!-- Param used to indicate if SVA has dedicated SLIM ports -->

        <param dedicated_sva_path="true" />

        <param dedicated_sva_path="false" />

        <param dedicated_headset_path="false" />

        <param platform_lpi_enable="true" />

        <param enable_debug_dumps="false" />
@@ -138,7 +138,7 @@ 
            <param lpi_mode="NON_LPI_BARGE_IN" />

            <param app_type="2" /> <!-- app type used in ACDB -->

            <param pdk5_app_type="5" />

            <param in_channels="3"/> <!-- Module input channels -->

            <param in_channels="2"/> <!-- Module input channels -->

            <module_params>

                <param module_type="GMM" />

                <param load_sound_model_ids="0x00012C1C, 0x0, 0x00012C14" />