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

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

Merge "Audio:hal: Add support of sound card for SBC8016 platform"

parents d51a4662 dd78e06d

hal/msm8916/hw_info.c

+5 −0
Original line number Diff line number Diff line
@@ -137,6 +137,11 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char 
        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

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

    } else if (!strcmp(snd_card_name, "msm8x16-snd-card-sbc")) {

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

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

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

    } else if (!strcmp(snd_card_name, "msm8x16-skuh-snd-card")) {

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

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

hal/msm8916/platform.c

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#define MIXER_XML_PATH "/system/etc/mixer_paths.xml"

#define MIXER_XML_PATH_MTP "/system/etc/mixer_paths_mtp.xml"

#define MIXER_XML_PATH_SBC "/system/etc/mixer_paths_sbc.xml"

#define MIXER_XML_PATH_MSM8909_PM8916 "/system/etc/mixer_paths_msm8909_pm8916.xml"

#define MIXER_XML_PATH_QRD_SKUH "/system/etc/mixer_paths_qrd_skuh.xml"

#define MIXER_XML_PATH_QRD_SKUI "/system/etc/mixer_paths_qrd_skui.xml"
@@ -745,6 +746,15 @@ static void query_platform(const char *snd_card_name, 
        msm_be_id_array_len  =

            sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);



    } else if (!strncmp(snd_card_name, "msm8x16-snd-card-sbc",

                 sizeof("msm8x16-snd-card-sbc"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SBC,

                sizeof(mixer_xml_path));



        msm_device_to_be_id = msm_device_to_be_id_internal_codec;

        msm_be_id_array_len  =

            sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);



    } else if (!strncmp(snd_card_name, "msm8x16-skuh-snd-card",

                 sizeof("msm8x16-skuh-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_QRD_SKUH,