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

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

Merge "hal: Update platform to select mixer_xml for sdm439"

parents e94bdd2a fc3be83a

configs/msm8937/mixer_paths_sdm439_pm8953.xml

0 → 100644
+1270 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/msm8937/msm8937.mk

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ PRODUCT_COPY_FILES +=\ 
hardware/qcom/audio/configs/msm8937/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf\

hardware/qcom/audio/configs/msm8937/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf\

hardware/qcom/audio/configs/msm8937/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_sdm439_pm8953.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_sdm439_pm8953.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_skuh.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd_skuh.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_skui.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd_skui.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_skuhf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd_skuhf.xml \

hal/msm8916/hw_info.c

+4 −1
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char 
        strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));

    } else if (!strcmp(snd_card_name, "msm8952-snd-card-mtp")) {

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

    } else if (!strcmp(snd_card_name, "sdm439-snd-card-mtp")) {

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

    } else if (!strcmp(snd_card_name, "msm8952-tomtom-snd-card")) {

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

     } else if (!strcmp(snd_card_name, "msm8952-tasha-snd-card")) {
@@ -212,7 +214,8 @@ void *hw_info_init(const char *snd_card_name) 
        strstr(snd_card_name, "msm8937") || strstr(snd_card_name, "msm8917") ||

        strstr(snd_card_name, "msm8940") || strstr(snd_card_name, "msm8920") ||

        strstr(snd_card_name, "sdm660") || strstr(snd_card_name, "apq8009") ||

        strstr(snd_card_name, "mdm9607") || strstr(snd_card_name, "mdm-tasha")) {

        strstr(snd_card_name, "mdm9607") || strstr(snd_card_name, "mdm-tasha") ||

        strstr(snd_card_name, "sdm439")) {

        ALOGV("8x16 - variant soundcard");

        update_hardware_info_8x16(hw_info, snd_card_name);

    } else {

hal/msm8916/platform.c

+11 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#define MIXER_XML_PATH "/etc/mixer_paths.xml"

#define MIXER_XML_PATH_MSM8909_PM8916 "/etc/mixer_paths_msm8909_pm8916.xml"

#define MIXER_XML_PATH_MTP "/etc/mixer_paths_mtp.xml"

#define MIXER_XML_PATH_SDM439_PM8953 "/etc/mixer_paths_sdm439_pm8953.xml"

#define MIXER_XML_PATH_SKU2 "/etc/mixer_paths_qrd_sku2.xml"

#define MIXER_XML_PATH_WCD9326 "/etc/mixer_paths_wcd9326.xml"

#define MIXER_XML_PATH_WCD9335 "/etc/mixer_paths_wcd9335.xml"
@@ -93,6 +94,7 @@ 
#define MIXER_XML_PATH "/vendor/etc/mixer_paths.xml"

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

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

#define MIXER_XML_PATH_SDM439_PM8953 "/vendor/etc/mixer_paths_sdm439_pm8953.xml"

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

#define PLATFORM_INFO_XML_PATH_EXTCODEC  "/vendor/etc/audio_platform_info_extcodec.xml"

#define PLATFORM_INFO_XML_PATH_SKUSH "/vendor/etc/audio_platform_info_skush.xml"
@@ -1229,6 +1231,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, "sdm439-snd-card-mtp",

                 sizeof("sdm439-snd-card-mtp"))) {

        strlcpy(mixer_xml_path, MIXER_XML_PATH_SDM439_PM8953,

                sizeof(MIXER_XML_PATH_SDM439_PM8953));

        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, "msm8952-tomtom-snd-card",

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

        strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9330,
@@ -7365,7 +7374,8 @@ int platform_spkr_prot_is_wsa_analog_mode(void *adev) 
        (!strcmp(snd_card_name, "msm8952-snd-card-mtp")) ||

        (!strcmp(snd_card_name, "msm8976-skun-snd-card")) ||

        (!strcmp(snd_card_name, "msm8953-snd-card-mtp")) ||

        (!strcmp(snd_card_name, "msm8953-sku4-snd-card")))

        (!strcmp(snd_card_name, "msm8953-sku4-snd-card")) ||

        (!strcmp(snd_card_name, "sdm439-snd-card-mtp")))

        return 1;

    else

        return 0;