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

Commit 31a053a5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: use correct platform info for sdmmagpie qrd device"

parents 9178f168 3ae92e59

hal/msm8974/hw_info.c

+4 −0
Original line number Diff line number Diff line
@@ -684,6 +684,10 @@ static void update_hardware_info_bear(struct hardware_info *hw_info, const char 
                 sizeof("sm6150-qrd-snd-card"))) {

        hw_info->is_stereo_spkr = false;

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

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

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

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

        hw_info->is_stereo_spkr = false;

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

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

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

hal/msm8974/platform.c

+6 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,9 @@ static void update_codec_type_and_interface(struct platform_data * my_data, 
         !strncmp(snd_card_name, "sdm439-sku1-snd-card",

                   sizeof("sdm439-sku1-snd-card")) ||

         !strncmp(snd_card_name, "sdm439-snd-card-mtp",

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

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

         !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;
@@ -2987,6 +2989,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 (!strncmp(snd_card_name, "kona-qrd-snd-card",

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

        platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);