commit 1adff8f4f42dfe35c4366e50aee696ae1efd345c
author Faiz Nabi Kuchay <fkuchay@codeaurora.org> Tue Jul 21 11:25:11 2020 +0530
committer Vatsal Bucha <vbucha@codeaurora.org> Thu Aug 06 10:17:18 2020 +0530
tree d02e427af60dd1403f9a6b012044fc2cc70c6abb
parent 54f1849762f242f8b2708018bb870f925588d8ee

hal: Add support for shima soundcard

Add soundcard support for shima target.

Change-Id: I9b493893600de25c506be1a6697eabee1f0df05a
Signed-off-by: Faiz Nabi Kuchay <fkuchay@codeaurora.org>

hal/msm8974/hw_info.c

diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index d8d6215..4ecd25f 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -598,6 +598,15 @@
     } else if (!strncmp(snd_card_name, "lahaina-cdp-snd-card",
                  sizeof("lahaina-cdp-snd-card"))) {
         strlcpy(hw_info->name, "lahaina", sizeof(hw_info->name));
+    } else if (!strncmp(snd_card_name, "lahaina-shimaidp-snd-card",
+                 sizeof("lahaina-shimaidp-snd-card"))) {
+        strlcpy(hw_info->name, "shima", sizeof(hw_info->name));
+    } else if (!strncmp(snd_card_name, "lahaina-shimaidps-snd-card",
+                 sizeof("lahaina-shimaidps-snd-card"))) {
+        strlcpy(hw_info->name, "shima", sizeof(hw_info->name));
+    } else if (!strncmp(snd_card_name, "lahaina-shimaqrd-snd-card",
+                 sizeof("lahaina-shimaqrd-snd-card"))) {
+        strlcpy(hw_info->name, "shima", sizeof(hw_info->name));
     } else {
         ALOGW("%s: Not a lahaina device", __func__);
     }
@@ -929,7 +938,7 @@
                || strstr(snd_card_name, "atoll") || strstr(snd_card_name, "bengal")) {
         ALOGV("KONA - variant soundcard");
         update_hardware_info_kona(hw_info, snd_card_name);
-    } else if(strstr(snd_card_name, "lahaina")) {
+    } else if(strstr(snd_card_name, "lahaina") || strstr(snd_card_name, "shima")) {
         ALOGV("LAHAINA - variant soundcard");
         update_hardware_info_lahaina(hw_info, snd_card_name);
     } else if(strstr(snd_card_name, "holi")) {

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 97f2732..5fda1f8 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -71,6 +71,8 @@
 #define PLATFORM_INFO_XML_PATH_I2S_NAME "audio_platform_info_extcodec.xml"
 #define PLATFORM_INFO_XML_PATH_WSA_NAME  "audio_platform_info_wsa.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_QRD "audio_platform_info_shimaqrd.xml"
 
 #include <linux/msm_audio.h>
 #if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM710) || \
@@ -1797,6 +1799,12 @@
                    sizeof("lahaina-cdp-snd-card")) ||
          !strncmp(snd_card_name, "kona-mtp-snd-card",
                    sizeof("kona-mtp-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-shimaidp-snd-card",
+                   sizeof("lahaina-shimaidp-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-shimaidps-snd-card",
+                   sizeof("lahaina-shimaidps-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-shimaqrd-snd-card",
+                   sizeof("lahaina-shimaqrd-snd-card")) ||
          !strncmp(snd_card_name, "kona-qrd-snd-card",
                    sizeof("kona-qrd-snd-card")) ||
          !strncmp(snd_card_name, "lito-mtp-snd-card",
@@ -3412,6 +3420,16 @@
                sizeof("qcs405-tdm-snd-card"))) {
         platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_TDM_NAME),
             my_data, PLATFORM);
+    } else if (!strncmp(snd_card_name, "lahaina-shimaidp-snd-card",
+               sizeof("lahaina-shimaidp-snd-card")) ||
+               !strncmp(snd_card_name, "lahaina-shimaidps-snd-card",
+               sizeof("lahaina-shimaidps-snd-card"))) {
+        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_SHIMA_IDP),
+            my_data, PLATFORM);
+    } else if (!strncmp(snd_card_name, "lahaina-shimaqrd-snd-card",
+               sizeof("lahaina-shimaqrd-snd-card"))) {
+        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_SHIMA_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);
@@ -3744,6 +3762,7 @@
         //TODO:: make generic interfaceface to check Slimbus/I2S/CDC_DMA
         if (!strncmp(snd_card_name, "sm6150", strlen("sm6150")) ||
             !strncmp(snd_card_name, "kona", strlen("kona")) ||
+            !strncmp(snd_card_name, "shima", strlen("shima")) ||
             !strncmp(snd_card_name, "lahaina", strlen("lahaina")) ||
             !strncmp(snd_card_name, "lito", strlen("lito")) ||
             !strncmp(snd_card_name, "atoll", strlen("atoll")) ||