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

Merge "hal: Pick correct platform info for scuba IDP and QRD"

This commit is contained in:
qctecmdr 2020-09-27 03:07:28 -07:00 committed by Gerrit - the friendly Code Review server
parent 7ad4c2e439 4afe311da0
commit 4da91c1c18
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hal/msm8974/platform.c
View File

@ -74,6 +74,8 @@
#define PLATFORM_INFO_XML_PATH_TDM_NAME "audio_platform_info_tdm.xml" #define PLATFORM_INFO_XML_PATH_TDM_NAME "audio_platform_info_tdm.xml"
#define PLATFORM_INFO_XML_PATH_SHIMA_IDP "audio_platform_info_shimaidp.xml" #define PLATFORM_INFO_XML_PATH_SHIMA_IDP "audio_platform_info_shimaidp.xml"
#define PLATFORM_INFO_XML_PATH_SHIMA_QRD "audio_platform_info_shimaqrd.xml" #define PLATFORM_INFO_XML_PATH_SHIMA_QRD "audio_platform_info_shimaqrd.xml"
#define PLATFORM_INFO_XML_PATH_SCUBA_IDP "audio_platform_info_scubaidp.xml"
#define PLATFORM_INFO_XML_PATH_SCUBA_QRD "audio_platform_info_scubaqrd.xml"
#include <linux/msm_audio.h> #include <linux/msm_audio.h>
#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || \ #if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || \
@ -1800,6 +1802,8 @@ static void update_codec_type_and_interface(struct platform_data * my_data,
sizeof("bengal-idp-snd-card")) || sizeof("bengal-idp-snd-card")) ||
!strncmp(snd_card_name, "bengal-scubaidp-snd-card", !strncmp(snd_card_name, "bengal-scubaidp-snd-card",
sizeof("bengal-scubaidp-snd-card")) || sizeof("bengal-scubaidp-snd-card")) ||
!strncmp(snd_card_name, "bengal-scubaqrd-snd-card",
sizeof("bengal-scubaqrd-snd-card")) ||
!strncmp(snd_card_name, "bengal-qrd-snd-card", !strncmp(snd_card_name, "bengal-qrd-snd-card",
sizeof("bengal-qrd-snd-card")) || sizeof("bengal-qrd-snd-card")) ||
!strncmp(snd_card_name, "holi-mtp-snd-card", !strncmp(snd_card_name, "holi-mtp-snd-card",
@ -3425,6 +3429,12 @@ void *platform_init(struct audio_device *adev)
sizeof("lahaina-shimaqrd-snd-card"))) { sizeof("lahaina-shimaqrd-snd-card"))) {
platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_SHIMA_QRD), platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_SHIMA_QRD),
my_data, PLATFORM); my_data, PLATFORM);
} else if (!strncmp(snd_card_name, "bengal-scubaidp-snd-card",
sizeof("bengal-scubaidp-snd-card"))) {
platform_info_init(PLATFORM_INFO_XML_PATH_SCUBA_IDP, my_data, PLATFORM);
} else if (!strncmp(snd_card_name, "bengal-scubaqrd-snd-card",
sizeof("bengal-scubaqrd-snd-card"))) {
platform_info_init(PLATFORM_INFO_XML_PATH_SCUBA_QRD, my_data, PLATFORM);
} else if (my_data->is_internal_codec) { } else if (my_data->is_internal_codec) {
platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_INTCODEC_NAME), platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_INTCODEC_NAME),
my_data, PLATFORM); my_data, PLATFORM);