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

Commit 7ef4a40f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: trinket: Change ACDB ID of speaker to mono"

parents 810a9031 fa5ddb25

configs/trinket/audio_platform_info_intcodec.xml

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
        <param key="input_mic_max_count" value="4"/>

    </config_params>

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

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

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

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

        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>

configs/trinket/mixer_paths_idp.xml

+9 −8
Original line number Diff line number Diff line
@@ -351,14 +351,14 @@ 
    <ctl name="HPHR Volume" value="20" />

    <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />



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

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

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

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

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

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

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

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

    <ctl name="TX_DEC0 Volume" value="102" />

    <ctl name="TX_DEC1 Volume" value="102" />

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

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

    <ctl name="TX_DEC4 Volume" value="102" />

    <ctl name="TX_DEC5 Volume" value="102" />

    <ctl name="TX_DEC6 Volume" value="102" />

    <ctl name="TX_DEC7 Volume" value="102" />



    <ctl name="ADC1 Volume" value="12" />

    <ctl name="ADC2 Volume" value="12" />
@@ -2178,6 +2178,7 @@ 


    <path name="headset-mic">

        <path name="amic2" />

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

    </path>



    <path name="voice-handset">

configs/trinket/mixer_paths_tasha.xml

+11 −9
Original line number Diff line number Diff line
@@ -67,15 +67,15 @@ 
    <ctl name="ADC4 Volume" value="0" />

    <ctl name="ADC5 Volume" value="12" />

    <ctl name="ADC6 Volume" value="12" />

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

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

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

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

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

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

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

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

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

    <ctl name="DEC0 Volume" value="102" />

    <ctl name="DEC1 Volume" value="102" />

    <ctl name="DEC2 Volume" value="102" />

    <ctl name="DEC3 Volume" value="102" />

    <ctl name="DEC4 Volume" value="102" />

    <ctl name="DEC5 Volume" value="102" />

    <ctl name="DEC6 Volume" value="102" />

    <ctl name="DEC7 Volume" value="102" />

    <ctl name="DEC8 Volume" value="102" />

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

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

    <ctl name="COMP7 Switch" value="0" />
@@ -2318,11 +2318,13 @@ 
    <path name="headset-mic">

        <path name="adc2" />

        <ctl name="ADC2 Volume" value="12" />

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

    </path>



    <path name="headset-mic-liquid">

        <path name="adc2" />

        <ctl name="ADC2 Volume" value="12" />

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

    </path>



    <path name="voice-handset">

configs/trinket/mixer_paths_tashalite.xml

+11 −9
Original line number Diff line number Diff line
@@ -67,15 +67,15 @@ 
    <ctl name="ADC4 Volume" value="0" />

    <ctl name="ADC5 Volume" value="12" />

    <ctl name="ADC6 Volume" value="12" />

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

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

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

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

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

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

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

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

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

    <ctl name="DEC0 Volume" value="102" />

    <ctl name="DEC1 Volume" value="102" />

    <ctl name="DEC2 Volume" value="102" />

    <ctl name="DEC3 Volume" value="102" />

    <ctl name="DEC4 Volume" value="102" />

    <ctl name="DEC5 Volume" value="102" />

    <ctl name="DEC6 Volume" value="102" />

    <ctl name="DEC7 Volume" value="102" />

    <ctl name="DEC8 Volume" value="102" />

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

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

    <ctl name="COMP7 Switch" value="0" />
@@ -2318,11 +2318,13 @@ 
    <path name="headset-mic">

        <path name="adc2" />

        <ctl name="ADC2 Volume" value="12" />

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

    </path>



    <path name="headset-mic-liquid">

        <path name="adc2" />

        <ctl name="ADC2 Volume" value="12" />

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

    </path>



    <path name="voice-handset">

configs/trinket/mixer_paths_tavil.xml

+9 −9
Original line number Diff line number Diff line
@@ -342,15 +342,15 @@ 
    <ctl name="ADC2 Volume" value="12" />

    <ctl name="ADC3 Volume" value="0" />

    <ctl name="ADC4 Volume" value="0" />

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

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

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

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

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

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

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

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

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

    <ctl name="DEC0 Volume" value="102" />

    <ctl name="DEC1 Volume" value="102" />

    <ctl name="DEC2 Volume" value="102" />

    <ctl name="DEC3 Volume" value="102" />

    <ctl name="DEC4 Volume" value="102" />

    <ctl name="DEC5 Volume" value="102" />

    <ctl name="DEC6 Volume" value="102" />

    <ctl name="DEC7 Volume" value="102" />

    <ctl name="DEC8 Volume" value="102" />



    <!-- Compander controls -->

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