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

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

Merge "configs: lito: add headset mixer paths"

parents ec36e178 56533e04

configs/kona/audio_platform_info.xml

+2 −0
Original line number Diff line number Diff line
@@ -151,7 +151,9 @@ 
        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

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

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

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

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

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

configs/kona/mixer_paths.xml

+11 −1
Original line number Diff line number Diff line
@@ -2552,11 +2552,21 @@ 
        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-full-headset">

        <ctl name="TTY Mode" value="FULL" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headphones">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headset">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-hco-handset">

        <ctl name="TTY Mode" value="HCO" />

        <path name="handset" />
@@ -2571,7 +2581,7 @@ 
    <path name="voice-tty-full-headset-mic">

        <path name="amic2" />

        <ctl name="ADC2 Volume" value="0" />

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

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

    </path>



    <path name="voice-tty-hco-headset-mic">

configs/kona/mixer_paths_qrd.xml

+10 −0
Original line number Diff line number Diff line
@@ -2840,11 +2840,21 @@ 
        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-full-headset">

        <ctl name="TTY Mode" value="FULL" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headphones">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headset">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-full-headset-mic">

        <path name="amic2" />

        <ctl name="ADC2 Volume" value="0" />

configs/lito/audio_platform_info.xml

+2 −0
Original line number Diff line number Diff line
@@ -142,7 +142,9 @@ 
        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

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

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

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

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

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

configs/lito/mixer_paths.xml

+30 −2
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ 
    <ctl name="WSA_CDC_DMA_RX_0_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" />
@@ -1758,6 +1759,10 @@ 
        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

    </path>



    <path name="compress-voip-call headset">

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

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

    </path>



    <path name="compress-voip-call bt-sco">

        <ctl name="SLIM_7_RX_Voice Mixer Voip" value="1" />
@@ -1905,6 +1910,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="audio-playback-voip headset">

        <path name="audio-playback-voip headphones" />

    </path>



    <path name="audio-playback-voip bt-sco">

        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -2512,11 +2521,21 @@ 
        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-full-headset">

        <ctl name="TTY Mode" value="FULL" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headphones">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-vco-headset">

        <ctl name="TTY Mode" value="VCO" />

        <path name="tty-headphones" />

    </path>



    <path name="voice-tty-hco-handset">

        <ctl name="TTY Mode" value="HCO" />

        <path name="handset" />
@@ -2531,11 +2550,16 @@ 
    <path name="voice-tty-full-headset-mic">

        <path name="amic2" />

        <ctl name="ADC2 Volume" value="0" />

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

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

    </path>



    <path name="voice-tty-hco-headset-mic">

        <path name="voice-tty-full-headset-mic" />

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

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

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

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

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

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

    </path>



    <path name="voice-tty-vco-handset-mic">
@@ -2721,6 +2745,10 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="mmap-playback headset">

        <path name="mmap-playback headphones" />

    </path>



    <path name="mmap-playback speaker-and-headphones">

        <path name="mmap-playback" />

        <path name="mmap-playback headphones" />