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

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

Merge "hal: Add support for 8909 QRD skua/skuc"

parents fc2ae053 06d6c56d

hal/msm8916/hw_info.c

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

        strlcpy(hw_info->type, "skua", 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 if (!strcmp(snd_card_name, "msm8909-skuc-snd-card")) {

        strlcpy(hw_info->type, "skuc", 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

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#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"

#define MIXER_XML_PATH_SKUK "/system/etc/mixer_paths_skuk.xml"

#define MIXER_XML_PATH_SKUA "/system/etc/mixer_paths_skua.xml"

#define MIXER_XML_PATH_SKUC "/system/etc/mixer_paths_skuc.xml"

#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"

#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"

#define MIXER_XML_PATH_WCD9306 "/system/etc/mixer_paths_wcd9306.xml"
@@ -498,6 +500,14 @@ static void query_platform(const char *snd_card_name, 
                 sizeof("msm8939-tomtom9330-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9330,

                sizeof(MIXER_XML_PATH_WCD9330));

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

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

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUA,

                sizeof(MIXER_XML_PATH_SKUA));

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

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

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUC,

                sizeof(MIXER_XML_PATH_SKUC));

    } else {

        strlcpy(mixer_xml_path, MIXER_XML_PATH,

                sizeof(MIXER_XML_PATH));