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

hal: Update platform to select correct mixer path for sdm439 sku1. 

Update platform to select correct mixer path for sdm439 sku1
with pmic pm8953.

Change-Id: I06afa9e84f0d54d721e053f9ac76752d215dfef7
This commit is contained in:
Xiaojun Sang 2018-04-02 17:27:15 +08:00 committed by Gerrit - the friendly Code Review server
parent d0bae9ba9c
commit 172e0fa9bd
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hal/msm8916/hw_info.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@ -118,6 +118,9 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char
strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "msm8952-snd-card-mtp")) {
strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "sdm439-sku1-snd-card")) {
hw_info->is_stereo_spkr = false;
strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "sdm439-snd-card-mtp")) {
strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "msm8952-tomtom-snd-card")) {

11
hal/msm8916/platform.c
View File

@ -1258,6 +1258,13 @@ static void query_platform(const char *snd_card_name,
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
} else if (!strncmp(snd_card_name, "sdm439-sku1-snd-card",
sizeof("sdm439-sku1-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_SDM439_PM8953,
sizeof(MIXER_XML_PATH_SDM439_PM8953));
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
} else if (!strncmp(snd_card_name, "msm8952-tomtom-snd-card",
sizeof("msm8952-tomtom-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9330,
@ -2085,6 +2092,10 @@ static bool check_and_get_wsa_info(char *snd_card_name, int *wsaCount,
sizeof("msm8953-snd-card-mtp")) ||
(!strncmp(snd_card_name, "msm8953-sku4-snd-card",
sizeof("msm8953-sku4-snd-card"))) ||
(!strncmp(snd_card_name, "sdm439-sku1-snd-card",
sizeof("sdm439-sku1-snd-card"))) ||
(!strncmp(snd_card_name, "sdm439-snd-card-mtp",
sizeof("sdm439-snd-card-mtp"))) ||
(!strncmp(snd_card_name, "msm8952-skum-snd-card",
sizeof("msm8952-skum-snd-card"))))) {
*is_wsa_combo_supported = true;