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

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

Merge "hal: 8939: add support for 8939 skul device"

parents ae8d3573 cfefb8bf

hal/msm8916/hw_info.c

+6 −0
Original line number Diff line number Diff line
@@ -210,6 +210,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, "msm8939-snd-card-skul")) {

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

        strlcpy(hw_info->name, "msm8939", 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

+8 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#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_SKUE "/system/etc/mixer_paths_skue.xml"

#define MIXER_XML_PATH_SKUL "/system/etc/mixer_paths_skul.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"
@@ -640,6 +641,13 @@ 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, "msm8939-snd-card-skul",

                 sizeof("msm8939-snd-card-skul"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUL,

                sizeof(MIXER_XML_PATH_SKUL));

        msm_device_to_be_id = msm_device_to_be_id_internal_codec;

        msm_be_id_array_len  =

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

    } else {

        strlcpy(mixer_xml_path, MIXER_XML_PATH,

                sizeof(MIXER_XML_PATH));