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

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

Merge "config: shima: update mixer controls for Shima QRD"

parents 8b793538 e10de4a0

configs/lahaina/audio_platform_info_shimaqrd.xml

+6 −4
Original line number Diff line number Diff line
@@ -158,7 +158,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="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" backend="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_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0"/>
@@ -166,7 +166,9 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="WSA_CDC_DMA_RX_0"/>

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

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

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="WSA_CDC_DMA_RX_0"/>
@@ -176,10 +178,10 @@ 
        <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_VOICE_TTY_HCO_HANDSET" interface="WSA_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="RX_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"/>

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

        <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="RX_CDC_DMA_RX_0"/>

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

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

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

configs/lahaina/mixer_paths_shimaqrd.xml

+196 −80
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />

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

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

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

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

    <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="0" />

    <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="0" />

    <ctl name="WSA_CDC_DMA_RX_0 Format" value="UNPACKED" />
@@ -312,6 +312,7 @@ 
    <ctl name="SpkrRight VISENSE Switch" value="0" />

    <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />

    <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />

    <ctl name="SWR DAC_Port Switch" value="0" />



    <!-- RX Controls -->

    <ctl name="RX_MACRO RX0 MUX" value="ZERO" />
@@ -338,11 +339,19 @@ 
    <ctl name="RX_EAR Mode" value="OFF" />



    <!-- TX Controls -->

    <!-- Enable these switches at the end of a path -->

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

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

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

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



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

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

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

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

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

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

    <ctl name="ADC2_BCS Disable" value="0" />

    <ctl name="ADC3 MUX" value="INP4" />

    <ctl name="ADC4 MUX" value="INP5" />

    <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" />
@@ -351,6 +360,15 @@ 
    <ctl name="TX_AIF1_CAP Mixer DEC5" value="0" />

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

    <ctl name="TX_AIF1_CAP Mixer DEC7" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC1" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC2" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC3" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC4" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC5" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC6" value="0" />

    <ctl name="TX_AIF2_CAP Mixer DEC7" value="0" />

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

    <ctl name="TX DMIC MUX0" value="ZERO" />

    <ctl name="TX SMIC MUX0" value="ZERO" />
@@ -375,6 +393,14 @@ 
    <ctl name="TX DEC7 MUX" value="MSM_DMIC" />

    <ctl name="TX DMIC MUX7" value="ZERO" />

    <ctl name="TX SMIC MUX7" value="ZERO" />

    <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="MBHC ChMap" value="ZERO" />

    <ctl name="BCS Channel" value="CH6" />



    <!-- Volume controls -->

    <ctl name="WSA_RX0 Digital Volume" value="84" />
@@ -478,11 +504,11 @@ 


    <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 Channels" value="One"/>

    </path>



    <path name="echo-reference handset">

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

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

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

    </path>
@@ -524,11 +550,11 @@ 


    <path name="echo-reference-voip">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />

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

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

    </path>



    <path name="echo-reference-voip handset">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />

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

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

    </path>
@@ -554,6 +580,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="deep-buffer-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>



    <path name="deep-buffer-playback speaker-protected">

        <path name="deep-buffer-playback" />

    </path>
@@ -661,6 +691,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>



    <path name="low-latency-playback speaker-protected">

        <path name="low-latency-playback" />

    </path>
@@ -772,6 +806,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>



    <path name="audio-ull-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>



    <path name="audio-ull-playback speaker-protected">

        <path name="audio-ull-playback" />

    </path>
@@ -881,6 +919,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>



    <path name="compress-offload-playback speaker-protected">

        <path name="compress-offload-playback" />

    </path>
@@ -1004,6 +1046,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />

    </path>
@@ -1112,6 +1158,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



    <path name="compress-offload-playback3 handset">

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

    </path>



    <path name="compress-offload-playback3 display-port">

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

    </path>
@@ -1199,6 +1249,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>



    <path name="compress-offload-playback4 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>



    <path name="compress-offload-playback4 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />

    </path>
@@ -1286,6 +1340,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>



    <path name="compress-offload-playback5 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />

    </path>
@@ -1373,6 +1431,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>



    <path name="compress-offload-playback6 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />

    </path>
@@ -1460,6 +1522,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>



    <path name="compress-offload-playback7 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>



    <path name="compress-offload-playback7 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />

    </path>
@@ -1547,6 +1613,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>



    <path name="compress-offload-playback8 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>



    <path name="compress-offload-playback8 display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />

    </path>
@@ -1634,6 +1704,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="compress-offload-playback9 handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="compress-offload-playback9 display-port">

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

    </path>
@@ -2042,6 +2116,11 @@ 
        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />

    </path>



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

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

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

    </path>



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

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

        <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
@@ -2095,6 +2174,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call handset">

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

        <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

        <ctl name="PROXY_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer PROXY_TX_MMode1" value="1" />
@@ -2163,6 +2247,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call handset">

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

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call headphones">

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

        <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
@@ -2236,6 +2325,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>



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

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

    </path>



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

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

    </path>
@@ -2322,86 +2415,134 @@ 
    <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="WSA_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 speaker-usb-headphones-and-haptics">

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">

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

        <ctl name="AFE_PCM_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 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="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-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" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

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

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-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" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-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="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

        <ctl name="RX_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" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

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

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

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

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

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

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

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

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

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

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

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-bt-sco-swb-and-haptics">

    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

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

    </path>



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

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

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

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

    </path>



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

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

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

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

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

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

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

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

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

    </path>



    <!-- These are actual sound device specific mixer settings -->
@@ -2473,8 +2614,8 @@ 


    <path name="speaker-mono">

        <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 RX1 MUX" value="AIF1_PB" />

        <ctl name="WSA_RX1 INP0" value="RX1" />

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

        <ctl name="SpkrRight COMP Switch" value="1" />

        <ctl name="SpkrRight VISENSE Switch" value="1" />
@@ -2645,25 +2786,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" />
@@ -2773,11 +2895,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" />
@@ -2827,11 +2944,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" />
@@ -3303,6 +3415,10 @@ 
        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="mmap-playback handset">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>



    <path name="mmap-playback headphones">

        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>

configs/lahaina/sound_trigger_mixer_paths_shimaqrd.xml

+2 −2
Original line number Diff line number Diff line
@@ -314,13 +314,13 @@ 


    <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 Channels" value="One"/>

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