commit 353ded4bfd37ad227bb91fcdfab0975982bf022d
author qctecmdr <qctecmdr@localhost> Tue Apr 07 07:27:35 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 07 07:27:35 2020 -0700
tree fa3a3a49d423f38733cc4c264d72a7f233bf44c8
parent 4d3834de84785576479f15fdc401092bfdb8b127
parent aa99a5e896a93e9241bd59671fe40f88b042471e

Merge "hal: Select audio platform configuration for lahaina"

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 8ee36f5..985de83 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1694,6 +1694,10 @@
                    sizeof("sm6150-idp-snd-card")) ||
          !strncmp(snd_card_name, "qcs605-lc-snd-card",
                    sizeof("qcs605-lc-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-mtp-snd-card",
+                   sizeof("lahaina-mtp-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-qrd-snd-card",
+                   sizeof("lahaina-qrd-snd-card")) ||
          !strncmp(snd_card_name, "kona-mtp-snd-card",
                    sizeof("kona-mtp-snd-card")) ||
          !strncmp(snd_card_name, "kona-qrd-snd-card",
@@ -3305,6 +3309,9 @@
     else if (!strncmp(snd_card_name, "sm6150-wcd9375qrd-snd-card",
                sizeof("sm6150-wcd9375qrd-snd-card")))
         platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);
+    else if (!strncmp(snd_card_name, "lahaina-qrd-snd-card",
+               sizeof("lahaina-qrd-snd-card")))
+        platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);
     else if (!strncmp(snd_card_name, "kona-qrd-snd-card",
                sizeof("kona-qrd-snd-card")))
         platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);
@@ -3583,6 +3590,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, "lahaina", strlen("lahaina")) ||
             !strncmp(snd_card_name, "lito", strlen("lito")) ||
             !strncmp(snd_card_name, "atoll", strlen("atoll")) ||
             !strncmp(snd_card_name, "trinket", strlen("trinket"))||