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

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

Merge "hal: add "haptics" device definition"

parents eddf899e d9bd9309

configs/lahaina/audio_platform_info_intcodec.xml

+0 −17
Original line number Diff line number Diff line
@@ -126,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"/>
@@ -151,7 +150,6 @@ 
    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" 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_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_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
@@ -160,11 +158,6 @@ 
        <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"/>
@@ -177,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="WSA_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"/>
@@ -195,9 +187,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"/>
@@ -315,12 +304,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 -->

configs/lahaina/audio_platform_info_qrd.xml

+0 −17
Original line number Diff line number Diff line
@@ -126,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"/>
@@ -153,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"/>
@@ -177,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="WSA_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"/>
@@ -195,9 +187,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"/>
@@ -315,12 +304,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 -->

configs/lahaina/audio_policy_configuration.xml

+2 −2
Original line number Diff line number Diff line
@@ -349,9 +349,9 @@ 
                <route type="mix" sink="Line"

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

                <route type="mix" sink="HDMI"

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

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

                <route type="mix" sink="Proxy"

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

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

                <route type="mix" sink="FM"

                       sources="primary output"/>

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

configs/lahaina/mixer_paths.xml

+93 −86
Original line number Diff line number Diff line
@@ -310,6 +310,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" />
@@ -2366,86 +2367,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 bt-sco-wb">

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

    </path>



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

    <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-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-safe-bt-sco-swb-and-haptics">

    <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 -->
@@ -2516,20 +2565,7 @@ 
        <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />

    </path>



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

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

        <ctl name="WSA RX0 MUX" value="AIF1_PB" />

        <ctl name="WSA RX1 MUX" value="AIF1_PB" />

        <ctl name="WSA_RX0 INP0" value="RX0" />

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

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

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

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

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

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

    <path name="haptics">

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

    </path>
@@ -2712,25 +2748,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" />
@@ -2840,11 +2857,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" />
@@ -2888,11 +2900,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" />

configs/lahaina/mixer_paths_cdp.xml

+93 −87

File changed.

Preview size limit exceeded, changes collapsed.