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

Commit fdaedc9f 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 titanium sku3" into av-userspace.lnx.1.0-dev.1.0

parents 9042760e 9cd237ab

hal/msm8916/hw_info.c

+6 −0
Original line number Diff line number Diff line
@@ -287,6 +287,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, "msm8953-sku3-tasha-snd-card")) {

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

        strlcpy(hw_info->name, "msm8953", 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, "msm8953-tasha-snd-card")) {

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

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

hal/msm8916/platform.c

+10 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#define MIXER_XML_PATH_SKU1 "/system/etc/mixer_paths_qrd_sku1.xml"

#define MIXER_XML_PATH_SKU2 "/system/etc/mixer_paths_qrd_sku2.xml"

#define MIXER_XML_PATH_SKUN_CAJON "/system/etc/mixer_paths_qrd_skun_cajon.xml"

#define MIXER_XML_PATH_SKU3 "/system/etc/mixer_paths_qrd_sku3.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_I2S "/system/etc/mixer_paths_i2s.xml"
@@ -780,6 +781,8 @@ static void update_codec_type(const char *snd_card_name) { 
                  sizeof("msm8939-tomtom9330-snd-card")) ||

         !strncmp(snd_card_name, "msm8952-tomtom-snd-card",

                  sizeof("msm8952-tomtom-snd-card")) ||

         !strncmp(snd_card_name, "msm8953-sku3-tasha-snd-card",

                  sizeof("msm8953-sku3-tasha-snd-card")) ||

         !strncmp(snd_card_name, "msm8952-tasha-snd-card",

                  sizeof("msm8952-tasha-snd-card")) ||

         !strncmp(snd_card_name, "msm8952-tashalite-snd-card",
@@ -987,6 +990,13 @@ static void query_platform(const char *snd_card_name, 
        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, "msm8953-sku3-tasha-snd-card",

                 sizeof("msm8953-sku3-tasha-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKU3,

                sizeof(MIXER_XML_PATH_SKU3));

        msm_device_to_be_id = msm_device_to_be_id_external_codec;

        msm_be_id_array_len  =

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

    } else if (!strncmp(snd_card_name, "msm8952-skum-snd-card",

                 sizeof("msm8952-skum-snd-card"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUM,