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

Commit a649469c 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 for pm8916 on msm8909"

parents 7812f475 733dbebd

hal/msm8916/hw_info.c

+6 −0
Original line number Diff line number Diff line
@@ -198,6 +198,12 @@ 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, "msm8909-pm8916-snd-card")) {

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

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

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

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

    } else {

        ALOGW("%s: Not an  8x16/8939/8909 device", __func__);

    }

hal/msm8916/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,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_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"

#define MIXER_XML_PATH_QRD_SKUHF "/system/etc/mixer_paths_qrd_skuhf.xml"
@@ -513,6 +514,10 @@ static void query_platform(const char *snd_card_name, 
                 sizeof("msm8909-skuc-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUC,

                sizeof(MIXER_XML_PATH_SKUC));

    } else if (!strncmp(snd_card_name, "msm8909-pm8916-snd-card",

                 sizeof("msm8909-pm8916-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_MSM8909_PM8916,

                sizeof(MIXER_XML_PATH_MSM8909_PM8916));

    } else {

        strlcpy(mixer_xml_path, MIXER_XML_PATH,

                sizeof(MIXER_XML_PATH));