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

Commit 4bf32db6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.2.2-00034. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2001136   Ib90a3d01975ef51804af3e384cf02ccbabefcbed   hal: msm8916: update is_stereo_spkr for sdm660
2001136   Ic78597a50e8f35683893d179a229425840ad2a94   configs: sdm660: Set bottom speaker as mono_speaker

Change-Id: Ia3db5e82fa15b29675cce794181320900a4187a1
CRs-Fixed: 2001136
parents 42f9b994 506f7c41

configs/sdm660/audio_platform_info.xml

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 
        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="12" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->

        <!-- speaker. It can be set to either left or right              -->

        <param key="mono_speaker" value="right"/>

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

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

        <param key="true_32_bit" value="true"/>
@@ -78,6 +81,10 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" acdb_id="150"/>

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

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>

configs/sdm660/audio_platform_info_extcodec.xml

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

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

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" acdb_id="150"/>

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

    </acdb_ids>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -70,6 +74,9 @@ 
    <config_params>

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

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

        <!-- In the below value string, the value indicates default mono -->

        <!-- speaker. It can be set to either left or right              -->

        <param key="mono_speaker" value="right"/>

        <!-- In the below value string, first parameter indicates size -->

        <!-- followed by perf lock options                             -->

        <param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/>

hal/msm8916/hw_info.c

+1 −4
Original line number Diff line number Diff line
@@ -154,13 +154,10 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char 
        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "sdm660-snd-card-mtp")) {

        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "sdm660-tasha-snd-card")) {

        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "sdm660-tavil-snd-card")) {

        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "sdm660-tashalite-snd-card")) {

        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "sdm660-tasha-skus-snd-card")) {

        hw_info->is_stereo_spkr = false;

        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "msm8920-sku7-snd-card")) {

        strlcpy(hw_info->name, "msm8920", sizeof(hw_info->name));