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

Commit 050c0732 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4a6aff44 on remote branch 

Change-Id: I949914621840f7b2e155ad2178b90abdbd1dbf35
parents d00af06d 4a6aff44

configs/atoll/audio_platform_info_intcodec.xml

+5 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
        <param key="spkr_1_tz_name" value="wsatz.13"/>

        <param key="spkr_2_tz_name" value="wsatz.14"/>

        <param key="true_32_bit" value="true"/>

        <param key="hifi_filter" value="false"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="hfp_pcm_dev_id" value="39"/>

        <param key="input_mic_max_count" value="4"/>
@@ -105,6 +106,7 @@ 
    </acdb_ids>

    <backend_names>

        <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_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"/>
@@ -112,6 +114,7 @@ 
        <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_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"/>
@@ -119,7 +122,9 @@ 
        <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

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

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -186,9 +191,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>

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

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

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

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

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

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

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

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

configs/atoll/audio_platform_info_qrd.xml

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
        <param key="mono_speaker" value="left"/>

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

        <param key="true_32_bit" value="true"/>

        <param key="hifi_filter" value="false"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="hfp_pcm_dev_id" value="39"/>

        <param key="input_mic_max_count" value="2"/>
@@ -104,6 +105,7 @@ 
    </acdb_ids>

    <backend_names>

        <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_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"/>
@@ -111,6 +113,7 @@ 
        <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_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"/>

configs/atoll/mixer_paths.xml

+14 −0
Original line number Diff line number Diff line
@@ -2763,6 +2763,10 @@ 
        <path name="headphones" />

    </path>



    <path name="headphones-hifi-filter">

        <path name="headphones" />

    </path>



    <path name="hph-highquality-mode">

    </path>
@@ -2852,6 +2856,11 @@ 
        <path name="speaker" />

    </path>



    <path name="speaker-and-headphones-hifi-filter">

        <path name="headphones" />

        <path name="speaker" />

    </path>



    <path name="speaker-safe-and-headphones">

        <path name="headphones" />

        <path name="speaker-safe" />
@@ -2963,6 +2972,7 @@ 
        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX_DEC2 Volume" value="84" />

    </path>



    <path name="speaker-dmic-endfire">
@@ -2971,6 +2981,7 @@ 
        <ctl name="TX DMIC MUX1" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX_DEC2 Volume" value="84" />

    </path>



    <path name="dmic-endfire">
@@ -3060,6 +3071,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

        <ctl name="TX_DEC3 Volume" value="84" />

    </path>



    <path name="speaker-tmic">
@@ -3070,6 +3082,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

        <ctl name="TX_DEC3 Volume" value="84" />

    </path>



    <path name="voice-speaker-tmic">
@@ -3085,6 +3098,7 @@ 
        <ctl name="TX DMIC MUX2" value="DMIC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC3" />

        <ctl name="TX_DEC3 Volume" value="84" />

        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />

        <ctl name="TX DMIC MUX4" value="DMIC4" />

    </path>

configs/atoll/mixer_paths_qrd.xml

100644 → 100755
+68 −48
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ 
    <!-- Multimode Voice2 -->

    <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />

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

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

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

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

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

    <!-- Multimode Voice2 BTSCO -->

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

    <ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" />
@@ -324,6 +324,7 @@ 
    <ctl name="ADC2 MUX" value="ZERO" />

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

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

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

    <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" />
@@ -2843,75 +2844,76 @@ 


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

    <path name="amic1">

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

        <ctl name="TX SMIC MUX0" value="ADC0" />

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC0" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="amic2">

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

        <ctl name="TX SMIC MUX0" value="ADC1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

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

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

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

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

    </path>





    <path name="amic3">

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

        <ctl name="TX SMIC MUX0" value="ADC1" />

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

    </path>



    <path name="amic4">

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

        <ctl name="TX SMIC MUX0" value="ADC2" />

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC2" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

    </path>



    <path name="dmic1">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC0" />

    </path>



    <path name="dmic2">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC1" />

    </path>



    <path name="dmic3">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

    </path>



    <path name="dmic4">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

    </path>

	

    <path name="dmic5">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC4" />

    </path>



    <path name="dmic6">

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

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC5" />

    </path>



    <path name="speaker">
@@ -3042,6 +3044,10 @@ 
        <path name="headphones" />

    </path>



    <path name="headphones-hifi-filter">

        <path name="headphones" />

    </path>



    <path name="hph-highquality-mode">

        <ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />

        <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -3108,6 +3114,11 @@ 
        <path name="speaker" />

    </path>



    <path name="speaker-and-headphones-hifi-filter">

        <path name="headphones" />

        <path name="speaker" />

    </path>



    <path name="speaker-safe-and-headphones">

        <path name="headphones" />

        <path name="speaker-safe" />
@@ -3188,19 +3199,28 @@ 
    <!-- Dual MIC devices -->

    <path name="handset-dmic-endfire">

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

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

        <ctl name="TX SMIC MUX0" value="ADC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

        <ctl name="TX DEC1 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX1" value="ADC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

    </path>



    <path name="speaker-dmic-endfire">

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

        <ctl name="TX DEC1 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX1" value="ADC1" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

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

    </path>



    <path name="speaker-dmic-endfire">

        <path name="handset-dmic-endfire" />

        <ctl name="TX DEC2 MUX" value="SWR_MIC" />

        <ctl name="TX SMIC MUX2" value="ADC0" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

    </path>



    <path name="dmic-endfire">
@@ -3311,36 +3331,36 @@ 


    <path name="three-mic">

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

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

         <ctl name="TX SMIC MUX0" value="ADC0" />

         <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

         <ctl name="TX DEC1 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX1" value="ADC1" />

         <ctl name="TX SMIC MUX1" value="ADC0" />

         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

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

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

         <ctl name="TX DEC2 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX2" value="ADC2" />

         <ctl name="TX SMIC MUX2" value="ADC1" />

         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

         <ctl name="TX DEC3 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX3" value="ADC2" />

         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

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

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

    </path>



    <path name="speaker-tmic">

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

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

         <ctl name="TX SMIC MUX0" value="ADC0" />

         <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />

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

         <ctl name="TX DEC1 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX1" value="ADC1" />

         <ctl name="TX SMIC MUX1" value="ADC0" />

         <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

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

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

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

         <ctl name="TX DEC2 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX2" value="ADC2" />

         <ctl name="TX SMIC MUX2" value="ADC1" />

         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

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

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

         <ctl name="TX DEC3 MUX" value="SWR_MIC" />

         <ctl name="TX SMIC MUX3" value="ADC2" />

         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

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

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

    </path>