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

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

Merge "configs: fix incorrect spv4 feedback channel"

parents ff02946f 08fa2705

configs/lahaina/audio_platform_info_shimaqrd.xml

+4 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 


<audio_platform_info>

    <acdb_ids>

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

        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="14"/>

        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="101"/>

        <device name="SND_DEVICE_IN_VOICE_REC_QMIC_FLUENCE" acdb_id="131"/>

        <device name="SND_DEVICE_IN_VOICE_REC_TMIC" acdb_id="131"/>

        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" acdb_id="132"/>
@@ -38,6 +38,7 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" acdb_id="150"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="151"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>

configs/lahaina/mixer_paths_shimaqrd.xml

+3 −3
Original line number Diff line number Diff line
@@ -2707,7 +2707,7 @@ 
        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />

        <path name="speaker" />

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

        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />

        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />

    </path>



    <path name="voice-speaker-protected">
@@ -2715,7 +2715,7 @@ 
        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />

        <path name="speaker-mono" />

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

        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />

        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />

    </path>



    <path name="voice-speaker-2-protected">
@@ -2723,7 +2723,7 @@ 
        <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />

        <path name="speaker-mono-2" />

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

        <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />

        <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />

    </path>



    <path name="voice-speaker-stereo-protected">