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

Commit 3c8e3575 authored by Aditya Bavanari's avatar Aditya Bavanari Committed by Gerrit - the friendly Code Review server
Browse files

hal: Add support for trinket soundcard 

Add soundcard support for multiple variants
of trinket target.

Change-Id: Ic95986c2bbaa6be718c3f2ad55d3e775a09b9be7
parent 5c1a2fa7

hal/msm8974/hw_info.c

+18 −1
Original line number Diff line number Diff line
@@ -679,6 +679,22 @@ static void update_hardware_info_bear(struct hardware_info *hw_info, const char 
        hw_info->num_snd_devices = ARRAY_SIZE(tavil_qrd_variant_devices);

        hw_info->is_stereo_spkr = false;

        strlcpy(hw_info->dev_extn, "-hdk", sizeof(hw_info->dev_extn));

    } else if (!strncmp(snd_card_name, "trinket-idp-snd-card",

                 sizeof("trinket-idp-snd-card"))) {

        hw_info->is_stereo_spkr = false;

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

    } else if (!strncmp(snd_card_name, "trinket-tashalite-snd-card",

                 sizeof("trinket-tashalite-snd-card"))) {

        hw_info->is_stereo_spkr = false;

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

    } else if (!strncmp(snd_card_name, "trinket-tasha-snd-card",

                 sizeof("trinket-tasha-snd-card"))) {

        hw_info->is_stereo_spkr = false;

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

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

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

        hw_info->is_stereo_spkr = false;

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

    } else {

        ALOGW("%s: Not an SDM device", __func__);

    }
@@ -731,7 +747,8 @@ void *hw_info_init(const char *snd_card_name) 
        update_hardware_info_sdm845(hw_info, snd_card_name);

    } else if (strstr(snd_card_name, "sdm660") || strstr(snd_card_name, "sdm670")

               || strstr(snd_card_name, "sm6150") || strstr(snd_card_name, "qcs605-lc")

               || strstr(snd_card_name, "qcs405") || strstr(snd_card_name, "qcs605-ipc")) {

               || strstr(snd_card_name, "qcs405") || strstr(snd_card_name, "qcs605-ipc")

               || strstr(snd_card_name, "sm6150") || strstr(snd_card_name, "trinket")) {

        ALOGV("Bear - variant soundcard");

        update_hardware_info_bear(hw_info, snd_card_name);

    } else if (strstr(snd_card_name, "sdx")) {

hal/msm8974/platform.c

+5 −2
Original line number Diff line number Diff line
@@ -1346,7 +1346,9 @@ static void update_codec_type_and_interface(struct platform_data * my_data, 
         !strncmp(snd_card_name, "kona-mtp-snd-card",

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

         !strncmp(snd_card_name, "kona-qrd-snd-card",

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

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

         !strncmp(snd_card_name, "trinket-idp-snd-card",

                   sizeof("trinket-idp-snd-card"))) {

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

         my_data->is_internal_codec = true;

         my_data->is_slimbus_interface = false;
@@ -2892,7 +2894,8 @@ acdb_init_fail: 
    if (!my_data->is_slimbus_interface) {

        //TODO:: make generic interfaceface to check Slimbus/I2S/CDC_DMA

        if (!strncmp(snd_card_name, "sm6150", strlen("sm6150")) ||

            !strncmp(snd_card_name, "kona", strlen("kona"))) {

            !strncmp(snd_card_name, "kona", strlen("kona")) ||

            !strncmp(snd_card_name, "trinket", strlen("trinket"))) {

            my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =

                strdup("WSA_CDC_DMA_RX_0 Format");

            my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =