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

Commit 929615b9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dda3ebc1 on remote branch 

Change-Id: I26ef9f7a0bf2e85590a3284c018750c02fce8714
parents 92f0d02c dda3ebc1

configs/atoll/audio_platform_info_qrd.xml

+8 −3
Original line number Diff line number Diff line
@@ -178,10 +178,15 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HDMI_MIC" interface="HDMI"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" interface="SLIMBUS_7_TX"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" interface="SLIMBUS_7_TX"/>

configs/atoll/mixer_paths_qrd.xml

+8 −6
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ 
    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />

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

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

    <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode1" value="0" />



    <!-- Multimode Voice1 BTSCO -->

    <ctl name="SLIM_7_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer SLIM_7_TX_MMode1" value="0" />
@@ -1997,7 +1999,7 @@ 
    </path>



    <path name="audio-record headset-mic">

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

        <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="1" />

    </path>



    <path name="audio-record usb-headset-mic">
@@ -2337,7 +2339,7 @@ 


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

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

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

    </path>



    <path name="compress-voip-call bt-sco">
@@ -2386,7 +2388,7 @@ 


    <path name="voicemmode1-call headset">

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

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

    </path>



    <path name="voicemmode1-call bt-sco">
@@ -2460,7 +2462,7 @@ 


    <path name="voicemmode2-call headset">

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

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

    </path>



    <path name="voicemmode2-call bt-sco">
@@ -2592,7 +2594,7 @@ 
    </path>



    <path name="audio-record-voip headset-mic">

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

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

    </path>



    <path name="audio-record-voip usb-headset-mic">
@@ -2897,7 +2899,7 @@ 
    </path>



    <path name="mmap-record headset-mic">

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

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

    </path>



    <path name="mmap-record bt-sco">

configs/bengal/audio_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

configs/bengal/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="35" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="36" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

configs/bengal/audio_platform_info_qrd.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="35" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="36" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />