commit b8df18bc7b60114bc721666dba12b76235316a89
author qctecmdr <qctecmdr@localhost> Mon Jun 01 10:34:34 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 01 10:34:34 2020 -0700
tree 458ae54eddd6ec9de1a346097b8c2178652076ed
parent 6173f57a5ee5ea519bcd9e03bdf02fec8c2f9694
parent 2040595c04c8e333b93b6aff526cb62d8cd98cac

Merge "hal: add support for Lahaina cdp device"

hal/msm8974/hw_info.c

diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index e95ceb5..fd3aba3 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -575,6 +575,9 @@
                  sizeof("lahaina-qrd-snd-card"))) {
         strlcpy(hw_info->name, "lahaina", sizeof(hw_info->name));
         hw_info->is_stereo_spkr = true;
+    } 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 {
         ALOGW("%s: Not a lahaina device", __func__);
     }

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 6267200..a80c5f8 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1760,6 +1760,8 @@
                    sizeof("lahaina-mtp-snd-card")) ||
          !strncmp(snd_card_name, "lahaina-qrd-snd-card",
                    sizeof("lahaina-qrd-snd-card")) ||
+         !strncmp(snd_card_name, "lahaina-cdp-snd-card",
+                   sizeof("lahaina-cdp-snd-card")) ||
          !strncmp(snd_card_name, "kona-mtp-snd-card",
                    sizeof("kona-mtp-snd-card")) ||
          !strncmp(snd_card_name, "kona-qrd-snd-card",