commit 4afe311da06521304af8a14d5985edac15b80d60
author Ramjee Singh <ramjee@codeaurora.org> Wed Sep 23 11:42:21 2020 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 23 22:31:15 2020 -0700
tree a8dba1adb0bdb51eb8dac38b4edf79e1306e5ab7
parent 132fe6348c1025587a9d59f2a6ff963807802658

hal: Pick correct platform info for scuba IDP and QRD

- Voice call does not work after switching to speaker
  as BE interface is not shared for handset and speaker
  in platform info xml.
- Fix is to load correct platform info with proper BE
  interface

Change-Id: Ic8fa1233e57f444a9daed336453e812588600b6d

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 6bd1093..955ba32 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -74,6 +74,8 @@
 #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_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>
 #if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || \
@@ -1799,6 +1801,8 @@
                    sizeof("bengal-idp-snd-card")) ||
          !strncmp(snd_card_name, "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",
                    sizeof("bengal-qrd-snd-card")) ||
          !strncmp(snd_card_name, "holi-mtp-snd-card",
@@ -3405,6 +3409,12 @@
                sizeof("lahaina-shimaqrd-snd-card"))) {
         platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_SHIMA_QRD),
             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) {
         platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_INTCODEC_NAME),
             my_data, PLATFORM);