commit fda291525e19913cd084f9798879ba712d6cf245
author Arusha Goyal <arushag@codeaurora.org> Mon Dec 26 10:53:39 2016 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 29 03:39:32 2016 -0800
tree b55163594d0c6671960886a5e9e772fafb2621c2
parent fa60f451f3a852eeddd36e43924759fade91f704

msm: Rename msmfalcon to sdm660

Update the code name from msmfalcon to sdm660. As part of this, update
the filename containing "falcon" and files content containing "falcon".

Conflicts:
	configs/sdm660/sdm660.mk

Change-Id: I5fc11ffac2f21f11e2a7283cf7375bcf93c01623

hal/msm8916/hw_info.c

diff --git a/hal/msm8916/hw_info.c b/hal/msm8916/hw_info.c
index 8b3056b..1fa40b4 100644
--- a/hal/msm8916/hw_info.c
+++ b/hal/msm8916/hw_info.c
@@ -150,16 +150,16 @@
         strlcpy(hw_info->name, "msm8917", sizeof(hw_info->name));
      } else if (!strcmp(snd_card_name, "msm8940-sku6-snd-card")) {
         strlcpy(hw_info->name, "msm8940", sizeof(hw_info->name));
-    } else if (!strcmp(snd_card_name, "msmfalcon-snd-card")) {
-        strlcpy(hw_info->name, "msmfalcon", sizeof(hw_info->name));
-    } else if (!strcmp(snd_card_name, "msmfalcon-snd-card-mtp")) {
-        strlcpy(hw_info->name, "msmfalcon", sizeof(hw_info->name));
-    } else if (!strcmp(snd_card_name, "msmfalcon-tasha-snd-card")) {
-        strlcpy(hw_info->name, "msmfalcon", sizeof(hw_info->name));
-    } else if (!strcmp(snd_card_name, "msmfalcon-tavil-snd-card")) {
-        strlcpy(hw_info->name, "msmfalcon", sizeof(hw_info->name));
-    } else if (!strcmp(snd_card_name, "msmfalcon-tashalite-snd-card")) {
-        strlcpy(hw_info->name, "msmfalcon", sizeof(hw_info->name));
+    } else if (!strcmp(snd_card_name, "sdm660-snd-card")) {
+        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
+    } else if (!strcmp(snd_card_name, "sdm660-snd-card-mtp")) {
+        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
+    } else if (!strcmp(snd_card_name, "sdm660-tasha-snd-card")) {
+        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
+    } else if (!strcmp(snd_card_name, "sdm660-tavil-snd-card")) {
+        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
+    } else if (!strcmp(snd_card_name, "sdm660-tashalite-snd-card")) {
+        strlcpy(hw_info->name, "sdm660", sizeof(hw_info->name));
     } else if (!strcmp(snd_card_name, "msm8920-sku7-snd-card")) {
         strlcpy(hw_info->name, "msm8920", sizeof(hw_info->name));
     } else if (!strcmp(snd_card_name, "apq8009-tashalite-snd-card")) {
@@ -167,7 +167,7 @@
     } else if (!strcmp(snd_card_name, "mdm9607-tomtom-i2s-snd-card")) {
         strlcpy(hw_info->name, "mdm9607", sizeof(hw_info->name));
     } else {
-        ALOGW("%s: Not an 8x16/8909/8917/8920/8937/8939/8940/8952/8953/falcon device", __func__);
+        ALOGW("%s: Not an 8x16/8909/8917/8920/8937/8939/8940/8952/8953/660 device", __func__);
     }
 }
 
@@ -194,7 +194,7 @@
         strstr(snd_card_name, "msm8976") || strstr(snd_card_name, "msm8953") ||
         strstr(snd_card_name, "msm8937") || strstr(snd_card_name, "msm8917") ||
         strstr(snd_card_name, "msm8940") || strstr(snd_card_name, "msm8920") ||
-        strstr(snd_card_name, "msmfalcon") || strstr(snd_card_name, "apq8009") ||
+        strstr(snd_card_name, "sdm660") || strstr(snd_card_name, "apq8009") ||
 		strstr(snd_card_name, "mdm9607")) {
         ALOGV("8x16 - variant soundcard");
         update_hardware_info_8x16(hw_info, snd_card_name);