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

Commit 5561b7ec authored by Harshal Ahire's avatar Harshal Ahire
Browse files

hal: Add support for 1MB SKU holi variant 



Add new sound-card entry for 1MB SKU variant.

Change-Id: Ie230f0d55cee9263e2cceab98d135ed6848b52b5
Signed-off-by: default avatarHarshal Ahire <hahire@codeaurora.org>
parent 386052b9

configs/holi/holi.mk

+4 −0
Original line number Diff line number Diff line
@@ -121,8 +121,10 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrdsku1.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrdsku1.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
@@ -160,8 +162,10 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_intcodec.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_qrdsku1.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_qrdsku1.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_configs.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_configs_stock.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/holi/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt

hal/msm8974/hw_info.c

+8 −5
Original line number Diff line number Diff line
@@ -574,15 +574,18 @@ static void update_hardware_info_holi( 
          const char *snd_card_name)

{

    if (!strncmp(snd_card_name, "holi-mtp-snd-card",

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

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

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

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

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

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

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

        !strncmp(snd_card_name, "holi-qrdsku1-snd-card",

                 sizeof("holi-qrdsku1-snd-card")) ||

        !strncmp(snd_card_name, "holi-mtpsku1-snd-card",

                 sizeof("holi-mtpsku1-snd-card"))) {

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

        hw_info->is_stereo_spkr = false;

    } else {

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

    }

    hw_info->is_stereo_spkr = false;

}



static void update_hardware_info_lahaina(

hal/msm8974/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -1803,8 +1803,12 @@ static void update_codec_type_and_interface(struct platform_data * my_data, 
                   sizeof("bengal-qrd-snd-card")) ||

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

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

         !strncmp(snd_card_name, "holi-mtpsku1-snd-card",

                   sizeof("holi-mtpsku1-snd-card")) ||

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

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

         !strncmp(snd_card_name, "holi-qrdsku1-snd-card",

                   sizeof("holi-qrdsku1-snd-card")) ||

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

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

         !strncmp(snd_card_name, "msm8953-snd-card-mtp",
@@ -3378,7 +3382,9 @@ void *platform_init(struct audio_device *adev) 
        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_QRD_NAME),

            my_data, PLATFORM);

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

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

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

               !strncmp(snd_card_name, "holi-qrdsku1-snd-card",

               sizeof("holi-qrdsku1-snd-card"))) {

        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_QRD_NAME),

            my_data, PLATFORM);

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