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

Commit 7e154ce1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: bengal: Update headset-mic controls for CDC_DMA_TX_4"

parents 656bee75 bbbf3c94

configs/bengal/audio_platform_info_intcodec.xml

+6 −6
Original line number Diff line number Diff line
@@ -169,10 +169,10 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" 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_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

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

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" 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" 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_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"/>
@@ -182,9 +182,9 @@ 
        <device name="SND_DEVICE_IN_VOICE_DMIC" 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_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_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

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

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

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

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

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

        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
@@ -217,7 +217,7 @@ 
        <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" 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_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"/>

configs/bengal/mixer_paths.xml

+39 −4
Original line number Diff line number Diff line
@@ -60,10 +60,17 @@ 
    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />

    <ctl name="MultiMedia5 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia5 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia1" value="0" />
@@ -238,6 +245,7 @@ 
    <ctl name="RX_CDC_DMA_RX_1_Voice Mixer Voip" value="0" />

    <ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="0" />

    <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="0" />

    <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_4_Voip" value="0" />

    <ctl name="SLIM_7_RX_Voice Mixer Voip" value="0" />

    <ctl name="Voip_Tx Mixer SLIM_7_TX_Voip" value="0" />

    <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
@@ -306,6 +314,7 @@ 


    <!-- TX Controls -->

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

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

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

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

    <ctl name="ADC2 MUX" value="ZERO" />
@@ -413,6 +422,7 @@ 


    <!-- defaults for mmap record -->

    <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_4" value="0" />

    <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="0" />

    <ctl name="MultiMedia16 Mixer SLIM_8_TX" value="0" />

    <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0" />
@@ -1864,6 +1874,10 @@ 
        <path name="audio-record bt-sco" />

    </path>



    <path name="audio-record headset-mic">

        <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record bt-sco-swb">

        <path name="audio-record bt-sco" />

    </path>
@@ -1876,6 +1890,10 @@ 
        <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="1" />

    </path>



    <path name="audio-record-compress headset-mic">

        <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record-compress bt-sco">

        <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />

    </path>
@@ -1922,6 +1940,10 @@ 
      <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="1" />

    </path>



    <path name="low-latency-record headset-mic">

      <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="low-latency-record bt-sco">

      <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="1" />

    </path>
@@ -2383,6 +2405,10 @@ 
        <ctl name="TX_DEC2 Volume" value="84" />

    </path>



    <path name="audio-record-voip headset-mic">

        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record-voip usb-headset-mic">

        <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />

    </path>
@@ -2410,9 +2436,10 @@ 
    <!-- These are actual sound device specific mixer settings -->

    <path name="amic2">

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

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

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

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

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

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

        <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>
@@ -2523,7 +2550,7 @@ 
    </path>



    <path name="handset-mic">

        <path name="dmic2" />

        <path name="dmic3" />

    </path>



    <path name="headphones">
@@ -3262,6 +3289,10 @@ 
      <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_3" value="1" />

    </path>



    <path name="mmap-record headset-mic">

      <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="mmap-record bt-sco">

      <ctl name="MultiMedia16 Mixer SLIM_7_TX" value="1" />

    </path>
@@ -3303,6 +3334,10 @@ 
        <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_3" value="1" />

    </path>



    <path name="hifi-record headset-mic">

        <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="hifi-record usb-headset-mic">

        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>

configs/bengal/mixer_paths_qrd.xml

+4 −4
Original line number Diff line number Diff line
@@ -2700,7 +2700,7 @@ 
    <!-- 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 SMIC MUX0" value="SWR_MIC0" />

        <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" />
@@ -2708,7 +2708,7 @@ 


    <path name="amic2">

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

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

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

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

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

        <ctl name="ADC2_MIXER Switch" value="1" />
@@ -2718,7 +2718,7 @@ 


    <path name="amic3">

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

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

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

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

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

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

configs/bengal/sound_trigger_mixer_paths.xml

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
    <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="DMIC4" />

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

    </path>



    <path name="listen-ape-handset-mic-preproc">
@@ -238,7 +238,7 @@ 
        <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="DMIC4" />

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

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

    </path>