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

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

Merge "configs: correct acdb id for HFP BT SA8155/SA6155"

parents fa634a1a 49b25133

configs/msmnile_au/audio_platform_info.xml

+17 −12
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
        <device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>

        <device name="SND_DEVICE_OUT_BUS_PHN" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BUS_RSE" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="21"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="39"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>
@@ -49,8 +49,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
@@ -111,10 +111,14 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />

        <usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />

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

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

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

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

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />

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

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

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

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

    </pcm_ids>



    <config_params>
@@ -131,6 +135,7 @@ 
        <param key="true_32_bit" value="true"/>

        <!-- In the below value string, the value indicates sidetone gain in dB -->

        <param key="usb_sidetone_gain" value="35"/>

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

    </config_params>



    <gain_db_to_level_mapping>
@@ -145,8 +150,8 @@ 
        <device name="SND_DEVICE_OUT_HANDSET" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="AUX_PCM_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="AUX_PCM_RX"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="TERT_TDM_RX_2"/>
@@ -163,8 +168,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="AUX_PCM_TX"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

configs/msmnile_au/mixer_paths_adp.xml

+27 −3
Original line number Diff line number Diff line
@@ -1601,8 +1601,6 @@ 
    </path>



    <path name="hfp-sco">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

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

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1630,20 +1628,38 @@ 
        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco bt-sco">

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb bt-sco-wb">

        <path name="hfp-sco-wb" />

    </path>



    <path name="hfp-sco-wb headphones">

        <path name="hfp-sco headphones" />

    </path>





    <path name="hfp-sco-wb headset">

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco-downlink">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

    </path>



    <path name="hfp-sco-wb-downlink">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <path name="hfp-sco-downlink" />

    </path>



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

        <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -2105,6 +2121,10 @@ 
        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-hfp">

        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-2">

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

    </path>
@@ -2121,6 +2141,10 @@ 
        <path name="speaker-mic-qrd" />

    </path>



    <path name="voice-speaker-mic-hfp">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>

configs/msmnile_au/mixer_paths_custom.xml

+27 −3
Original line number Diff line number Diff line
@@ -1589,8 +1589,6 @@ 
    </path>



    <path name="hfp-sco">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

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

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1618,20 +1616,38 @@ 
        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco bt-sco">

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb bt-sco-wb">

        <path name="hfp-sco-wb" />

    </path>



    <path name="hfp-sco-wb headphones">

        <path name="hfp-sco headphones" />

    </path>





    <path name="hfp-sco-wb headset">

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco-downlink">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

    </path>



    <path name="hfp-sco-wb-downlink">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <path name="hfp-sco-downlink" />

    </path>



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

        <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -2093,6 +2109,10 @@ 
        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-hfp">

        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-2">

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

    </path>
@@ -2109,6 +2129,10 @@ 
        <path name="speaker-mic-qrd" />

    </path>



    <path name="voice-speaker-mic-hfp">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>

configs/msmsteppe_au/audio_platform_info.xml

+17 −12
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
        <device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>

        <device name="SND_DEVICE_OUT_BUS_PHN" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BUS_RSE" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="21"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="39"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>
@@ -49,8 +49,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="95"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="20"/>

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" acdb_id="38"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
@@ -111,10 +111,14 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />

        <usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />

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

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

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

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

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />

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

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

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

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

    </pcm_ids>



    <config_params>
@@ -131,6 +135,7 @@ 
        <param key="true_32_bit" value="true"/>

        <!-- In the below value string, the value indicates sidetone gain in dB -->

        <param key="usb_sidetone_gain" value="35"/>

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

    </config_params>



    <gain_db_to_level_mapping>
@@ -145,8 +150,8 @@ 
        <device name="SND_DEVICE_OUT_HANDSET" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BT_SCO" interface="AUX_PCM_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" interface="AUX_PCM_RX"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="TERT_TDM_RX_2"/>
@@ -163,8 +168,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="TERT_TDM_TX_0"/>

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

        <device name="SND_DEVICE_IN_BT_SCO_MIC_WB" interface="AUX_PCM_TX"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

configs/msmsteppe_au/mixer_paths_adp.xml

+26 −3
Original line number Diff line number Diff line
@@ -1372,8 +1372,6 @@ 
    </path>



    <path name="hfp-sco">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />

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

        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
@@ -1397,16 +1395,33 @@ 
    <path name="hfp-sco headphones">

    </path>



    <path name="hfp-sco bt-sco">

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />

        <path name="hfp-sco" />

    </path>



    <path name="hfp-sco-wb bt-sco-wb">

        <path name="hfp-sco-wb" />

    </path>



    <path name="hfp-sco-wb headphones">

        <path name="hfp-sco headphones" />

    </path>



    <path name="hfp-sco-downlink">

        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />

        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />

    </path>



    <path name="hfp-sco-wb-downlink">

        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />

        <path name="hfp-sco-downlink" />

    </path>



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

        <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
@@ -1831,6 +1846,10 @@ 
        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-hfp">

        <path name="speaker-mono" />

    </path>



    <path name="voice-speaker-2">

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

    </path>
@@ -1847,6 +1866,10 @@ 
        <path name="speaker-mic-qrd" />

    </path>



    <path name="voice-speaker-mic-hfp">

        <path name="speaker-mic" />

    </path>



    <path name="voice-headphones">

        <path name="headphones" />

    </path>