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

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

Merge "msmnile: update speaker mic for qrd device" into audio-hal.lnx.5.0

parents 1b9e83af 91affea7

configs/msmnile/mixer_paths_tavil.xml

+4 −0
Original line number Diff line number Diff line
@@ -1923,6 +1923,10 @@ 
    <path name="speaker-mic-sbc">

    </path>



    <path name="speaker-mic-qrd">

        <path name="dmic1" />

    </path>



    <path name="speaker-protected">

        <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />

        <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />

hal/msm8974/hw_info.c

+12 −2
Original line number Diff line number Diff line
@@ -219,6 +219,16 @@ static const snd_device_t tavil_qrd_variant_devices[] = { 
    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

};



static const snd_device_t tavil_qrd_msmnile_variant_devices[] = {

    SND_DEVICE_OUT_SPEAKER,

    SND_DEVICE_OUT_VOICE_SPEAKER,

    SND_DEVICE_OUT_HANDSET,

    SND_DEVICE_OUT_VOICE_HANDSET,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

    SND_DEVICE_IN_SPEAKER_MIC,

};





static const snd_device_t auto_variant_devices[] = {

    SND_DEVICE_OUT_SPEAKER

};
@@ -425,8 +435,8 @@ static void update_hardware_info_msmnile(struct hardware_info *hw_info, const c 
    if (strstr(snd_card_name, "qrd")) {

        strlcpy(hw_info->type, " qrd", sizeof(hw_info->type));

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

        hw_info->snd_devices = (snd_device_t *)tavil_qrd_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tavil_qrd_variant_devices);

        hw_info->snd_devices = (snd_device_t *)tavil_qrd_msmnile_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tavil_qrd_msmnile_variant_devices);

        hw_info->is_stereo_spkr = false;

        strlcpy(hw_info->dev_extn, "-qrd", sizeof(hw_info->dev_extn));

    } else if (strstr(snd_card_name, "pahu")) {