audio: renaming thulium to msm8996
Use appropriate SOC name.
Change-Id: I08e17ec9b240869c5357ad181f1fb17a0d06b969
diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index 50e8f97..c96d11e 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -87,7 +87,7 @@
SND_DEVICE_IN_HANDSET_MIC,
};
-static const snd_device_t tomtom_thulium_CDP_variant_devices[] = {
+static const snd_device_t tomtom_8996_CDP_variant_devices[] = {
};
static const snd_device_t tomtom_liquid_variant_devices[] = {
@@ -252,34 +252,34 @@
}
}
-static void update_hardware_info_thulium(struct hardware_info *hw_info, const char *snd_card_name)
+static void update_hardware_info_8996(struct hardware_info *hw_info, const char *snd_card_name)
{
- if (!strcmp(snd_card_name, "msmthulium-tomtom-mtp-snd-card")) {
+ if (!strcmp(snd_card_name, "msm8996-tomtom-mtp-snd-card")) {
strlcpy(hw_info->type, " mtp", sizeof(hw_info->type));
- strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));
+ strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
hw_info->snd_devices = NULL;
hw_info->num_snd_devices = 0;
strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));
- } else if (!strcmp(snd_card_name, "msmthulium-tomtom-cdp-snd-card")) {
+ } else if (!strcmp(snd_card_name, "msm8996-tomtom-cdp-snd-card")) {
strlcpy(hw_info->type, " cdp", sizeof(hw_info->type));
- strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));
- hw_info->snd_devices = (snd_device_t *)tomtom_thulium_CDP_variant_devices;
- hw_info->num_snd_devices = ARRAY_SIZE(tomtom_thulium_CDP_variant_devices);
+ strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
+ hw_info->snd_devices = (snd_device_t *)tomtom_8996_CDP_variant_devices;
+ hw_info->num_snd_devices = ARRAY_SIZE(tomtom_8996_CDP_variant_devices);
strlcpy(hw_info->dev_extn, "-cdp", sizeof(hw_info->dev_extn));
- } else if (!strcmp(snd_card_name, "msmthulium-tomtom-stp-snd-card")) {
+ } else if (!strcmp(snd_card_name, "msm8996-tomtom-stp-snd-card")) {
strlcpy(hw_info->type, " stp", sizeof(hw_info->type));
- strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));
+ strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tomtom_stp_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tomtom_stp_variant_devices);
strlcpy(hw_info->dev_extn, "-stp", sizeof(hw_info->dev_extn));
- } else if (!strcmp(snd_card_name, "msmthulium-tomtom-liquid-snd-card")) {
+ } else if (!strcmp(snd_card_name, "msm8996-tomtom-liquid-snd-card")) {
strlcpy(hw_info->type, " liquid", sizeof(hw_info->type));
- strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));
+ strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tomtom_liquid_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tomtom_liquid_variant_devices);
strlcpy(hw_info->dev_extn, "-liquid", sizeof(hw_info->dev_extn));
} else {
- ALOGW("%s: Not a thulium device", __func__);
+ ALOGW("%s: Not a 8996 device", __func__);
}
}
@@ -408,9 +408,9 @@
} else if(strstr(snd_card_name, "msm8994")) {
ALOGV("8994 - variant soundcard");
update_hardware_info_8994(hw_info, snd_card_name);
- } else if(strstr(snd_card_name, "thulium")) {
- ALOGV("thulium - variant soundcard");
- update_hardware_info_thulium(hw_info, snd_card_name);
+ } else if(strstr(snd_card_name, "msm8996")) {
+ ALOGV("8996 - variant soundcard");
+ update_hardware_info_8996(hw_info, snd_card_name);
} else {
ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);
free(hw_info);
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index c7d7f0e..7deb6da 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -229,7 +229,7 @@
#define PLAYBACK_OFFLOAD_DEVICE8 38
#define PLAYBACK_OFFLOAD_DEVICE9 39
#endif
-#if defined (PLATFORM_MSM8994) || defined (PLATFORM_THULIUM)
+#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996)
#define PLAYBACK_OFFLOAD_DEVICE2 17
#define PLAYBACK_OFFLOAD_DEVICE3 18
#define PLAYBACK_OFFLOAD_DEVICE4 37
@@ -303,7 +303,7 @@
#define FM_RX_VOLUME "Quat MI2S FM RX Volume"
#elif PLATFORM_MSM8994
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"
-#elif PLATFORM_THULIUM
+#elif PLATFORM_MSM8996
#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"
#else
#define FM_RX_VOLUME "Internal FM RX Volume"