dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hal: Add support for 1MB SKU holi variant"

This commit is contained in:
qctecmdr 2020-09-15 10:44:14 -07:00 committed by Gerrit - the friendly Code Review server
parent 65f9b9909c 5561b7ecab
commit 29372d33a1
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/holi/holi.mk
View File

@ -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

13
hal/msm8974/hw_info.c
View File

@ -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(

8
hal/msm8974/platform.c
View File

@ -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",