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

Commit e7482c13 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 sound card support for sdmmagpie qrd device"

parents e7eb16d7 dc9bdfb4

configs/msmsteppe/mixer_paths_wcd9375qrd.xml

0 → 100644
+2535 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/msmsteppe/msmsteppe.mk

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ PRODUCT_COPY_FILES += \ 
    hardware/qcom/audio/configs/msmsteppe/mixer_paths_idp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_idp.xml \

    hardware/qcom/audio/configs/msmsteppe/mixer_paths_wcd9375.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd9375.xml \

    hardware/qcom/audio/configs/msmsteppe/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \

    hardware/qcom/audio/configs/msmsteppe/mixer_paths_wcd9375qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd9375qrd.xml \

    hardware/qcom/audio/configs/msmsteppe/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \



#XML Audio configuration files

hal/msm8974/hw_info.c

+4 −0
Original line number Diff line number Diff line
@@ -622,6 +622,10 @@ static void update_hardware_info_bear(struct hardware_info *hw_info, const char 
    } else if (!strncmp(snd_card_name, "sm6150-wcd9375-snd-card",

                 sizeof("sm6150-wcd9375-snd-card"))) {

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

    } else if (!strncmp(snd_card_name, "sm6150-wcd9375qrd-snd-card",

                 sizeof("sm6150-wcd9375qrd-snd-card"))) {

        hw_info->is_stereo_spkr = false;

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

    } else if (!strncmp(snd_card_name, "sm6150-qrd-snd-card",

                 sizeof("sm6150-qrd-snd-card"))) {

        hw_info->is_stereo_spkr = false;

hal/msm8974/platform.c

+6 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,9 @@ static void update_codec_type_and_interface(struct platform_data * my_data, cons 
         !strncmp(snd_card_name, "sm6150-idp-snd-card",

                   sizeof("sm6150-idp-snd-card")) ||

         !strncmp(snd_card_name, "sm6150-wcd9375-snd-card",

                   sizeof("sm6150-wcd9375-snd-card"))   ) {

                   sizeof("sm6150-wcd9375-snd-card")) ||

         !strncmp(snd_card_name, "sm6150-wcd9375qrd-snd-card",

                   sizeof("sm6150-wcd9375qrd-snd-card"))) {

         ALOGI("%s: snd_card_name: %s",__func__,snd_card_name);

         my_data->is_internal_codec = true;

         my_data->is_slimbus_interface = false;
@@ -2253,6 +2255,9 @@ void *platform_init(struct audio_device *adev) 
    else if (!strncmp(snd_card_name, "sm6150-qrd-snd-card",

               sizeof("sm6150-qrd-snd-card")))

        platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);

    else if (!strncmp(snd_card_name, "sm6150-wcd9375qrd-snd-card",

               sizeof("sm6150-wcd9375qrd-snd-card")))

        platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);

    else if (my_data->is_internal_codec)

        platform_info_init(PLATFORM_INFO_XML_PATH_INTCODEC, my_data, PLATFORM);

    else