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

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

Merge "hal: Add support for lito soundcard"

parents 07f7540a 6339b09a

hal/msm8974/hw_info.c

+8 −1
Original line number Diff line number Diff line
@@ -521,10 +521,17 @@ static void update_hardware_info_kona( 
    if (!strncmp(snd_card_name, "kona-mtp-snd-card",

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

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

    } else if (!strncmp(snd_card_name, "lito-mtp-snd-card",

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

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

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

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

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

        hw_info->is_stereo_spkr = false;

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

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

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

        hw_info->is_stereo_spkr = false;

    } else {

        ALOGW("%s: Not a kona device", __func__);

    }
@@ -792,7 +799,7 @@ void *hw_info_init(const char *snd_card_name) 
    } else if (strstr(snd_card_name, "sda845")) {

        ALOGV("SDA845 - variant soundcard");

        update_hardware_info_sda845(hw_info, snd_card_name);

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

    } else if (strstr(snd_card_name, "kona") || strstr(snd_card_name, "lito")) {

        ALOGV("KONA - variant soundcard");

        update_hardware_info_kona(hw_info, snd_card_name);

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

hal/msm8974/platform.c

+8 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,10 @@ static void update_codec_type_and_interface(struct platform_data * my_data, 
                   sizeof("kona-mtp-snd-card")) ||

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

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

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

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

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

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

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

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

         !strncmp(snd_card_name, "sdm439-sku1-snd-card",
@@ -3021,6 +3025,9 @@ void *platform_init(struct audio_device *adev) 
    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);

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

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

        platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);

    else if (!strncmp(snd_card_name, "qcs405-wsa-snd-card",

               sizeof("qcs405-wsa-snd-card")))

        platform_info_init(PLATFORM_INFO_XML_PATH_WSA, my_data, PLATFORM);
@@ -3274,6 +3281,7 @@ acdb_init_fail: 
        //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, "lito", strlen("lito")) ||

            !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");