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

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

Merge "hal: configs: update audio routes for holi"

parents a025c929 0ab321c2

configs/holi/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

configs/holi/audio_platform_info_qrd.xml

+39 −4
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />

        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="12" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="12" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="12" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="12" />

        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="29" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="29" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />
@@ -114,6 +116,9 @@ 
        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_UPLINK_AND_DOWNLINK" type="in" id="23" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>
@@ -156,7 +161,7 @@ 
        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="RX_CDC_DMA_RX_1"/>
@@ -164,7 +169,8 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="RX_CDC_DMA_RX_1"/>
@@ -188,24 +194,48 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_WSA" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA" interface="RX_CDC_DMA_RX_1"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_EXTERNAL" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
@@ -214,6 +244,7 @@ 
        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="SLIMBUS_7_TX"/>
@@ -221,7 +252,9 @@ 
        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_CAMCORDER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_DMIC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_QMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
@@ -232,8 +265,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_AANC_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" interface="WSA_CDC_DMA_TX_0"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" interface="WSA_CDC_DMA_TX_0"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" interface="WSA_CDC_DMA_TX_0"/>
@@ -259,12 +292,14 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface="RX_CDC_DMA_RX_5"/>

    </backend_names>

    <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->

    <microphone_characteristics>

configs/holi/mixer_paths.xml

+547 −0

File changed.

Preview size limit exceeded, changes collapsed.

configs/holi/mixer_paths_qrd.xml

+276 −62

File changed.

Preview size limit exceeded, changes collapsed.

configs/holi/sound_trigger_mixer_paths_qrd.xml

+19 −22
Original line number Diff line number Diff line
@@ -249,9 +249,12 @@ 
    </path>



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

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

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

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

        <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" />

    </path>



    <path name="listen-ape-handset-mic-preproc">
@@ -262,10 +265,17 @@ 
        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />

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

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

        <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="DMIC2" />

        <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="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-tmic">
@@ -300,24 +310,11 @@ 
    <path name="listen-ape-headset-mic">

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

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

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

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

        <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">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_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">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_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"/>

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

    </path>



    <path name="echo-reference a2dp">