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
diff --git a/hal/Android.mk b/hal/Android.mk
index 570e556..0ab0b9e 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -35,14 +35,14 @@
endif
endif
-ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold msmfalcon,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold sdm660,$(TARGET_BOARD_PLATFORM)),)
AUDIO_PLATFORM = msm8916
MULTIPLE_HW_VARIANTS_ENABLED := true
LOCAL_CFLAGS := -DPLATFORM_MSM8916
ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSM8909
endif
-ifneq ($(filter msmfalcon,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm660,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSMFALCON
endif
endif
diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index 309a9a8..89a6670 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -204,6 +204,8 @@
// Only consider sound cards associated with ADSP
if ((strncasecmp(card_id, "msm", 3) != 0) &&
+ (strncasecmp(card_id, "sdm", 3) != 0) &&
+ (strncasecmp(card_id, "sdc", 3) != 0) &&
(strncasecmp(card_id, "apq", 3) != 0)) {
ALOGW("Skip over non-ADSP snd card %s", card_id);
continue;
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);
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index f657f77..81b50b6 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -884,16 +884,16 @@
sizeof("msm8953-tasha-snd-card")) ||
!strncmp(snd_card_name, "msm8953-tashalite-snd-card",
sizeof("msm8953-tashalite-snd-card")) ||
- !strncmp(snd_card_name, "msmfalcon-tasha-snd-card",
- sizeof("msmfalcon-tasha-snd-card")) ||
+ !strncmp(snd_card_name, "sdm660-tasha-snd-card",
+ sizeof("sdm660-tasha-snd-card")) ||
!strncmp(snd_card_name, "apq8009-tashalite-snd-card",
sizeof("apq8009-tashalite-snd-card")) ||
!strncmp(snd_card_name, "mdm9607-tomtom-i2s-snd-card",
sizeof("mdm9607-tomtom-i2s-snd-card")) ||
- !strncmp(snd_card_name, "msmfalcon-tashalite-snd-card",
- sizeof("msmfalcon-tashalite-snd-card")) ||
- !strncmp(snd_card_name, "msmfalcon-tavil-snd-card",
- sizeof("msmfalcon-tavil-snd-card")))
+ !strncmp(snd_card_name, "sdm660-tashalite-snd-card",
+ sizeof("sdm660-tashalite-snd-card")) ||
+ !strncmp(snd_card_name, "sdm660-tavil-snd-card",
+ sizeof("sdm660-tavil-snd-card")))
{
ALOGI("%s: snd_card_name: %s",__func__,snd_card_name);
is_external_codec = true;
@@ -1181,36 +1181,36 @@
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
- } else if (!strncmp(snd_card_name, "msmfalcon-snd-card",
- sizeof("msmfalcon-snd-card"))) {
+ } else if (!strncmp(snd_card_name, "sdm660-snd-card",
+ sizeof("sdm660-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH,
MAX_MIXER_XML_PATH);
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
- } else if (!strncmp(snd_card_name, "msmfalcon-snd-card-mtp",
- sizeof("msmfalcon-snd-card-mtp"))) {
+ } else if (!strncmp(snd_card_name, "sdm660-snd-card-mtp",
+ sizeof("sdm660-snd-card-mtp"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_MTP,
MAX_MIXER_XML_PATH);
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
- } else if (!strncmp(snd_card_name, "msmfalcon-tasha-snd-card",
- sizeof("msmfalcon-tasha-snd-card"))) {
+ } else if (!strncmp(snd_card_name, "sdm660-tasha-snd-card",
+ sizeof("sdm660-tasha-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9335,
sizeof(MIXER_XML_PATH_WCD9335));
msm_device_to_be_id = msm_device_to_be_id_external_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_external_codec) / sizeof(msm_device_to_be_id_external_codec[0]);
- } else if (!strncmp(snd_card_name, "msmfalcon-tashalite-snd-card",
- sizeof("msmfalcon-tashalite-snd-card"))) {
+ } else if (!strncmp(snd_card_name, "sdm660-tashalite-snd-card",
+ sizeof("sdm660-tashalite-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9326,
sizeof(MIXER_XML_PATH_WCD9326));
msm_device_to_be_id = msm_device_to_be_id_external_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_external_codec) / sizeof(msm_device_to_be_id_external_codec[0]);
- } else if (!strncmp(snd_card_name, "msmfalcon-tavil-snd-card",
- sizeof("msmfalcon-tavil-snd-card"))) {
+ } else if (!strncmp(snd_card_name, "sdm660-tavil-snd-card",
+ sizeof("sdm660-tavil-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_WCD9340,
sizeof(MIXER_XML_PATH_WCD9340));
msm_device_to_be_id = msm_device_to_be_id_external_codec;
@@ -1578,10 +1578,10 @@
return "msm8953-tasha-snd-card";
}
- if(!strncmp(snd_card_name, "msmfalcon-tashalite-snd-card",
- sizeof("msmfalcon-tashalite-snd-card"))) {
+ if(!strncmp(snd_card_name, "sdm660-tashalite-snd-card",
+ sizeof("sdm660-tashalite-snd-card"))) {
ALOGD("using tasha ACDB files for tasha-lite");
- return "msmfalcon-tasha-snd-card";
+ return "sdm660-tasha-snd-card";
}
return snd_card_name;
}
@@ -1648,8 +1648,8 @@
int wsa_count = 0;
/* SL/SH hardware always has wsa by default, no need to add wsa */
- if(!strncmp(snd_card_name, "msmfalcon", strlen("msmfalcon"))) {
- ALOGD(" Ignore WSA extension for msm falcon varients");
+ if(!strncmp(snd_card_name, "sdm660", strlen("sdm660"))) {
+ ALOGD(" Ignore WSA extension for sdm 660 varients");
return false;
}
@@ -2067,7 +2067,7 @@
my_data->current_backend_cfg[SLIMBUS_0_TX].samplerate_mixer_ctl =
strdup("SLIM_0_TX SampleRate");
} else {
- if (!strncmp(snd_card_name, "msmfalcon", strlen("msmfalcon"))) {
+ if (!strncmp(snd_card_name, "sdm660", strlen("sdm660"))) {
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
strdup("INT4_MI2S_RX Format");