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

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

Merge "config: lahaina: update mixer controls for Lahaina HDK device"

parents a3349693 bcfa2c08
Loading
Loading
Loading
Loading
+2 −17
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@
        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>
        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>
        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />
        <usecase name="USECASE_AUDIO_RECORD_VOIP_LOW_LATENCY" type="in" id="13" />
        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />
        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />
        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="12" />
@@ -125,7 +126,6 @@
        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" acdb_id="15"/>
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="101"/>
@@ -152,18 +152,12 @@
        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS" backend="headphones-and-haptics" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS" backend="speaker-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS" backend="speaker-safe-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
         <device name="SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS" backend="speaker-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS" backend="speaker-safe-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -176,7 +170,6 @@
        <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_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="WSA_CDC_DMA_RX_0"/>
@@ -185,6 +178,7 @@
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_HAC_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="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="WSA_CDC_DMA_RX_0"/>
@@ -196,9 +190,6 @@
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="WSA_CDC_DMA_RX_0-and-HDMI"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
        <device name="SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS" backend="speaker-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS" backend="speaker-safe-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
        <device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
@@ -316,12 +307,6 @@
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
	<device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS" backend="speaker-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS" backend="speaker-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS" backend="speaker-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS" backend="speaker-safe-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS" backend="speaker-safe-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS" backend="speaker-safe-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-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 -->
+136 −79
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@
    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="0" />
    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="0" />
    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="0" />
    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0" />
    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0" />
    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
@@ -354,6 +355,7 @@
    <ctl name="ADC2_BCS Disable" value="0" />
    <ctl name="ADC3 MUX" value="INP4" />
    <ctl name="ADC4 MUX" value="INP5" />
    <ctl name="TX LPI Enable" value="0" />
    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
@@ -505,6 +507,10 @@
        <ctl name="GSM mode Enable" value="ON" />
    </path>

    <path name="tx-lpi-enable">
        <ctl name="TX LPI Enable" value="1" />
    </path>

    <path name="echo-reference">
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="One"/>
@@ -551,6 +557,21 @@
        <path name="echo-reference bt-sco" />
    </path>

    <path name="echo-reference-voip-low-latency">
        <ctl name="AUDIO_REF_EC_UL8 MUX" value="WSA_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="One"/>
    </path>

    <path name="echo-reference-voip-low-latency handset">
        <ctl name="AUDIO_REF_EC_UL8 MUX" value="RX_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="One"/>
    </path>

    <path name="echo-reference-voip-low-latency headphones">
        <ctl name="AUDIO_REF_EC_UL8 MUX" value="RX_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="Two"/>
    </path>

    <path name="echo-reference-voip">
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
        <ctl name="EC Reference Channels" value="One"/>
@@ -2423,6 +2444,10 @@
    </path>

    <!-- VoIP Tx settings -->
    <path name="audio-record-voip-low-latency">
        <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="1" />
    </path>

    <path name="audio-record-voip">
        <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="1" />
    </path>
@@ -2454,85 +2479,133 @@
    <path name="spkr-vi-record">
    </path>

    <path name="audio-with-haptics-playback speaker-and-haptics">
    <path name="audio-with-haptics-playback">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback headphones-and-haptics">
    <path name="audio-with-haptics-playback speaker-protected">
        <path name="audio-with-haptics-playback" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe">
        <path name="audio-with-haptics-playback" />
    </path>

    <path name="audio-with-haptics-playback display-port">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
        <ctl name="DISPLAY_PORT Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-headphones-and-haptics">
    <path name="audio-with-haptics-playback display-port1">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
	    <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
        <ctl name="DISPLAY_PORT1 Mixer MultiMedia31" value="1" />
    </path>

	<path name="audio-with-haptics-playback speaker-saefe-headphones-and-haptics">
    <path name="audio-with-haptics-playback bt-sco">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback bt-sco-wb">
        <path name="audio-with-haptics-playback bt-sco" />
    </path>

    <path name="audio-with-haptics-playback bt-sco-swb">
        <path name="audio-with-haptics-playback bt-sco" />
    </path>

    <path name="audio-with-haptics-playback speaker-and-display-port">
        <path name="audio-with-haptics-playback display-port" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-usb-headphones-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
    <path name="audio-with-haptics-playback speaker-and-display-port1">
        <path name="audio-with-haptics-playback display-port1" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
	    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-usb-headphones-and-haptics">
    <path name="audio-with-haptics-playback afe-proxy">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback usb-headphones">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-bt-a2dp-and-haptics">
    <path name="audio-with-haptics-playback usb-headset">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-and-usb-headphones">
        <path name="audio-with-haptics-playback usb-headphones" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-bt-a2dp-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
        <path name="audio-with-haptics-playback usb-headphones" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-bt-sco-and-haptics">
    <path name="audio-with-haptics-playback headphones">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback headset">
        <path name="audio-with-haptics-playback headphones" />
    </path>

    <path name="audio-with-haptics-playback speaker-and-headphones">
        <path name="audio-with-haptics-playback headphones" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-bt-sco-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    <path name="audio-with-haptics-playback speaker-safe-and-headphones">
        <path name="audio-with-haptics-playback headphones" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-bt-sco-wb-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    <path name="audio-with-haptics-playback speaker-and-bt-sco">
        <path name="audio-with-haptics-playback bt-sco" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-bt-sco-wb-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
        <path name="audio-with-haptics-playback bt-sco" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-bt-sco-swb-and-haptics">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
        <path name="audio-with-haptics-playback bt-sco-wb" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-bt-sco-swb-and-haptics">
    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
        <path name="audio-with-haptics-playback bt-sco-wb" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
        <path name="audio-with-haptics-playback bt-sco-swb" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback bt-a2dp">
        <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">
        <path name="audio-with-haptics-playback bt-a2dp" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
        <path name="audio-with-haptics-playback bt-a2dp" />
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
    </path>

@@ -2548,14 +2621,15 @@

    <path name="amic2">
        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX0" value="SWR_MIC1" />
        <ctl name="TX SMIC MUX0" value="SWR_MIC5" />
        <ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
        <ctl name="DEC0_BCS Switch" value="1" />
        <ctl name="TX_AIF2_CAP Mixer DEC0" value="1" />
        <ctl name="ADC2 MUX" value="INP2" />
        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
        <ctl name="MBHC ChMap" value="SWRM_TX1_CH3" />
        <ctl name="BCS Channel" value="CH2" />
        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
        <ctl name="MBHC ChMap" value="SWRM_TX3_CH3" />
        <ctl name="TX1 MODE" value="ADC_LP" />
        <ctl name="BCS Channel" value="CH10" />
        <ctl name="HDR12 MUX" value="NO_HDR12" />
        <ctl name="ADC2_MIXER Switch" value="1" />
    </path>
@@ -2568,6 +2642,7 @@
        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
        <ctl name="ADC2 MUX" value="INP3" />
        <ctl name="ADC2_BCS Disable" value="1" />
        <ctl name="HDR12 MUX" value="NO_HDR12" />
        <ctl name="ADC2_MIXER Switch" value="1" />
    </path>
@@ -2618,14 +2693,7 @@
        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
    </path>

    <path name="speaker-and-haptics">
        <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
        <ctl name="WSA RX0 MUX" value="AIF1_PB" />
        <ctl name="WSA_RX0 INP0" value="RX0" />
        <ctl name="WSA_COMP1 Switch" value="1" />
        <ctl name="SpkrLeft COMP Switch" value="1" />
        <ctl name="SpkrLeft VISENSE Switch" value="1" />
        <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
    <path name="haptics">
        <ctl name="SWR DAC_Port Switch" value="1" />
    </path>

@@ -2806,25 +2874,6 @@
        <ctl name="HPHR_RDAC Switch" value="1" />
    </path>

    <path name="headphones-and-haptics">
        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
        <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
        <ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
        <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
        <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
        <ctl name="RX_COMP1 Switch" value="1" />
        <ctl name="RX_COMP2 Switch" value="1" />
        <ctl name="HPH_L Switch" value="1" />
        <ctl name="HPH_R Switch" value="1" />
        <ctl name="HPHL_COMP Switch" value="1" />
        <ctl name="HPHR_COMP Switch" value="1" />
        <ctl name="HPHL_RDAC Switch" value="1" />
        <ctl name="HPHR_RDAC Switch" value="1" />
        <ctl name="SWR DAC_Port Switch" value="1" />
    </path>

    <path name="headphones-dsd">
        <ctl name="RX_CDC_DMA_5 RX Format" value="DSD_DOP" />
        <ctl name="RX_CDC_DMA_RX_5 Channels" value="One" />
@@ -2940,11 +2989,6 @@
        <path name="speaker" />
    </path>

    <path name="speaker-headphones-and-haptics">
        <path name="headphones" />
        <path name="speaker-and-haptics" />
    </path>

    <path name="speaker-and-headphones-hifi-filter">
        <path name="headphones" />
        <path name="speaker" />
@@ -2994,11 +3038,6 @@
        <path name="usb-headphones" />
    </path>

    <path name="speaker-usb-headphones-and-haptics">
        <path name="speaker-and-haptics" />
        <path name="usb-headphones" />
    </path>

    <path name="speaker-safe-and-usb-headphones">
        <path name="speaker-safe" />
        <path name="usb-headphones" />
@@ -3252,10 +3291,15 @@

    <path name="voice-tty-hco-headset-mic">
        <ctl name="TX DEC6 MUX" value="SWR_MIC" />
        <ctl name="TX SMIC MUX6" value="ADC1" />
        <ctl name="TX SMIC MUX6" value="SWR_MIC5" />
        <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
        <ctl name="TX_AIF1_CAP Mixer DEC6" value="1" />
        <ctl name="TX_AIF2_CAP Mixer DEC6" value="1" />
        <ctl name="ADC2 MUX" value="INP2" />
        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
        <ctl name="MBHC ChMap" value="SWRM_TX3_CH3" />
        <ctl name="TX1 MODE" value="ADC_LP" />
        <ctl name="BCS Channel" value="CH10" />
        <ctl name="HDR12 MUX" value="NO_HDR12" />
        <ctl name="ADC2_MIXER Switch" value="1" />
    </path>

@@ -3718,6 +3762,10 @@
        <path name="incall_music_uplink" />
    </path>

    <path name="incall_music_uplink hearing-aid">
        <path name="incall_music_uplink" />
    </path>

    <path name="incall_music_uplink2">
        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
    </path>
@@ -3789,8 +3837,17 @@
    <path name="incall_music_uplink2 bt-a2dp">
        <path name="incall_music_uplink2" />
    </path>

    <path name="incall_music_uplink2 afe-proxy">
        <path name="incall_music_uplink2" />
    </path>

    <path name="incall_music_uplink2 call-proxy">
        <path name="incall_music_uplink2" />
    </path>

    <path name="incall_music_uplink2 hearing-aid">
        <path name="incall_music_uplink2" />
    </path>

</mixer>
+29 −4
Original line number Diff line number Diff line
@@ -86,7 +86,20 @@
    <ctl name="LPI Enable" value="0" />
    <ctl name="ADC2 Volume" value="12" />
    <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />
    <ctl name="VA_DEC1 MODE" value="ADC_DEFAULT" />
    <ctl name="VA_DEC2 MODE" value="ADC_DEFAULT" />
    <ctl name="VA_DEC3 MODE" value="ADC_DEFAULT" />
    <ctl name="ADC2_BCS Disable" value="0" />
    <ctl name="ADC1 ChMap" value="ZERO" />
    <ctl name="ADC2 ChMap" value="ZERO" />
    <ctl name="ADC3 ChMap" value="ZERO" />
    <ctl name="ADC4 ChMap" value="ZERO" />
    <ctl name="HDR12 MUX" value="NO_HDR12" />
    <ctl name="HDR34 MUX" value="NO_HDR34" />
    <ctl name="TX0 MODE" value="ADC_NORMAL" />
    <ctl name="TX1 MODE" value="ADC_NORMAL" />
    <ctl name="TX2 MODE" value="ADC_NORMAL" />
    <ctl name="TX3 MODE" value="ADC_NORMAL" />

    <path name="listen-voice-wakeup-1">
        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
@@ -284,10 +297,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="SWR_MIC1" />
        <ctl name="VA SMIC MUX0" value="SWR_MIC5" />
        <ctl name="TX1 MODE" value="ADC_LP" />
        <ctl name="ADC2 MUX" value="INP2" />
        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
        <ctl name="ADC2 ChMap" value="SWRM_TX1_CH2" />
        <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" />
        <ctl name="HDR12 MUX" value="NO_HDR12" />
        <ctl name="ADC2_BCS Disable" value="1" />
        <ctl name="ADC2_MIXER Switch" value="1" />
@@ -300,13 +314,24 @@
        <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"/>
    <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"/>