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

Merge "audio: hal: Update platform file"

This commit is contained in:
Linux Build Service Account 2018-04-18 19:56:46 -07:00 committed by Gerrit - the friendly Code Review server
parent 69e7fe146e effd7565c4
commit 338fd3bfce
4 changed files with 2468 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2458
configs/sdm670/mixer_paths_lc.xml Normal file
View File

File diff suppressed because it is too large Load Diff

1
configs/sdm670/sdm670.mk
View File

@ -89,6 +89,7 @@ PRODUCT_COPY_FILES += \
hardware/qcom/audio/configs/sdm670/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths_lc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_lc.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \
hardware/qcom/audio/configs/sdm670/mixer_paths_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_i2s.xml \

5
hal/msm8974/hw_info.c
View File

@ -542,6 +542,9 @@ static void update_hardware_info_bear(struct hardware_info *hw_info, const char
if (!strncmp(snd_card_name, "sdm660-snd-card",
sizeof("sdm660-snd-card")))
strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
if (!strncmp(snd_card_name, "qcs605-lc-snd-card",
sizeof("qcs605-lc-snd-card")))
strlcpy(hw_info->name, "qcs605-lc", sizeof(hw_info->name));
else if (!strncmp(snd_card_name, "sdm660-tavil-snd-card",
sizeof("sdm660-tavil-snd-card")))
strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
@ -597,7 +600,7 @@ void *hw_info_init(const char *snd_card_name)
} else if(strstr(snd_card_name, "sdm845")) {
ALOGV("SDM845 - variant soundcard");
update_hardware_info_sdm845(hw_info, snd_card_name);
} else if (strstr(snd_card_name, "sdm660") || strstr(snd_card_name, "sdm670")) {
} else if (strstr(snd_card_name, "sdm660") || strstr(snd_card_name, "sdm670") || strstr(snd_card_name, "qcs605-lc")) {
ALOGV("Bear - variant soundcard");
update_hardware_info_bear(hw_info, snd_card_name);
} else if (strstr(snd_card_name, "sdx")) {

7
hal/msm8974/platform.c
View File

@ -1038,7 +1038,9 @@ static void update_codec_type_and_interface(struct platform_data * my_data, cons
!strncmp(snd_card_name, "sdm660-snd-card-mtp",
sizeof("sdm660-snd-card-mtp")) ||
!strncmp(snd_card_name, "sdm670-mtp-snd-card",
sizeof("sdm670-mtp-snd-card"))) {
sizeof("sdm670-mtp-snd-card")) ||
!strncmp(snd_card_name, "qcs605-lc-snd-card",
sizeof("qcs605-lc-snd-card"))) {
ALOGI("%s: snd_card_name: %s",__func__,snd_card_name);
my_data->is_internal_codec = true;
my_data->is_slimbus_interface = false;
@ -2377,7 +2379,8 @@ acdb_init_fail:
if (!my_data->is_slimbus_interface) {
if (!strncmp(snd_card_name, "sdm660", strlen("sdm660")) ||
!strncmp(snd_card_name, "sdm670", strlen("sdm670"))) {
!strncmp(snd_card_name, "sdm670", strlen("sdm670")) ||
!strncmp(snd_card_name, "qcs605", strlen("qcs605"))) {
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
strdup("INT4_MI2S_RX Format");