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

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

Merge "config: lahaina: update mixer control and be for haptics devices"

parents 92efe254 4b9be2cc

configs/lahaina/audio_platform_info_intcodec.xml

+14 −1
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ 
        <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"/>
@@ -189,6 +193,9 @@ 
        <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"/>
@@ -305,6 +312,12 @@ 
        <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"/>

    </backend_names>

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

    <microphone_characteristics>

configs/lahaina/audio_platform_info_qrd.xml

+14 −1
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ 
        <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"/>
@@ -189,6 +193,9 @@ 
        <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"/>
@@ -305,6 +312,12 @@ 
        <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"/>

    </backend_names>

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

    <microphone_characteristics>

configs/lahaina/audio_policy_configuration.xml

+8 −8
Original line number Diff line number Diff line
@@ -349,15 +349,15 @@ 
                <route type="mix" sink="FM"

                       sources="primary output"/>

                <route type="mix" sink="BT SCO"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="BT SCO Headset"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="BT SCO Car Kit"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="USB Device Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output"/>

                <route type="mix" sink="USB Headset Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output"/>

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="voice_rx"
@@ -377,11 +377,11 @@ 
                <route type="mix" sink="mmap_no_irq_in"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="BT A2DP Out"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="BT A2DP Headphones"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="BT A2DP Speaker"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

            </routes>

configs/lahaina/mixer_paths.xml

+82 −0
Original line number Diff line number Diff line
@@ -2326,6 +2326,78 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



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

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

    </path>



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

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

    </path>



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

        <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-safe-usb-headphones-and-haptics">

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

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



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



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

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

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

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

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

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



    <!-- These are actual sound device specific mixer settings -->

    <path name="amic2">

        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
@@ -2701,6 +2773,11 @@ 
        <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" />
@@ -2744,6 +2821,11 @@ 
        <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" />

configs/lahaina/mixer_paths_cdp.xml

+83 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
    <ctl name="WSA_CDC_DMA_TX_0 Format" value="UNPACKED" />

    <ctl name="RX_CDC_DMA_RX_0 Format" value="UNPACKED" />

    <ctl name="TX_CDC_DMA_TX_3 Format" value="UNPACKED" />

    <ctl name="WSA_CDC_DMA_TX_0 SampleRate" value="KHZ_48" />

    <!-- HFP start -->

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

    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0" />
@@ -2183,6 +2184,78 @@ 
        <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



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

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

    </path>



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

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

    </path>



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

        <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-safe-usb-headphones-and-haptics">

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

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



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



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

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

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

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

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

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



    <!-- These are actual sound device specific mixer settings -->

    <path name="amic1">

        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
@@ -2598,6 +2671,11 @@ 
        <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" />
@@ -2638,6 +2716,11 @@ 
        <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" />