msm: 8998: Replace cobalt with 8998

Update the code name from msmcobalt to msm8998. As a result, update
the filename containing "cobalt" and files content containing "cobalt".

CRs-Fixed: 1070840
Change-Id: I2c7b95e3e2a2fec7730724da9eeb86a39a77faf1
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>

4 files changed, 25 insertions, 26 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 38b8a806584f..553b35a2d717 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -989,7 +989,7 @@ config SND_SOC_MSM_STUB
 
 config SND_SOC_MSM_HDMI_CODEC_RX
 	bool "HDMI Audio Playback"
-	depends on FB_MSM_MDSS_HDMI_PANEL && (SND_SOC_APQ8084 || SND_SOC_MSM8994 || SND_SOC_MSM8996 || SND_SOC_MSMCOBALT)
+	depends on FB_MSM_MDSS_HDMI_PANEL && (SND_SOC_APQ8084 || SND_SOC_MSM8994 || SND_SOC_MSM8996 || SND_SOC_MSM8998)
 	help
 	HDMI audio drivers should be built only if the platform
         supports hdmi panel.
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index 9cf69eca0028..a5cd94f91cfc 100644
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -190,8 +190,8 @@ config SND_SOC_MSM8996
 	 the machine driver and the corresponding
 	 DAI-links
 
-config SND_SOC_MSMCOBALT
-	tristate "SoC Machine driver for MSMCOBALT boards"
+config SND_SOC_MSM8998
+	tristate "SoC Machine driver for MSM8998 boards"
 	depends on ARCH_QCOM
 	select SND_SOC_COMPRESS
 	select SND_SOC_QDSP6V2
@@ -215,7 +215,7 @@ config SND_SOC_MSMCOBALT
 	select SND_HWDEP
         select DTS_EAGLE
 	help
-	 To add support for SoC audio on MSMCOBALT.
+	 To add support for SoC audio on MSM8998.
 	 This will enable sound soc drivers which
 	 interfaces with DSP, also it will enable
 	 the machine driver and the corresponding
diff --git a/sound/soc/msm/Makefile b/sound/soc/msm/Makefile
index 799c9ee63d43..8df7fad3893d 100644
--- a/sound/soc/msm/Makefile
+++ b/sound/soc/msm/Makefile
@@ -16,9 +16,9 @@ obj-$(CONFIG_SND_SOC_CPE) += snd-soc-cpe.o
 snd-soc-msm8996-objs := msm8996.o
 obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-msm8996.o
 
-# for MSMCOBALT sound card driver
-snd-soc-msmcobalt-objs := msmcobalt.o
-obj-$(CONFIG_SND_SOC_MSMCOBALT) += snd-soc-msmcobalt.o
+# for MSM8998 sound card driver
+snd-soc-msm8998-objs := msm8998.o
+obj-$(CONFIG_SND_SOC_MSM8998) += snd-soc-msm8998.o
 
 # for MSMFALCON sound card driver
 snd-soc-msmfalcon-common-objs := msm-audio-pinctrl.o msmfalcon-common.o
@@ -33,4 +33,3 @@ obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-int-codec.o
 snd-soc-ext-codec-objs := msmfalcon-external.o msmfalcon-ext-dai-links.o
 obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-msmfalcon-common.o
 obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-ext-codec.o
-
diff --git a/sound/soc/msm/msmcobalt.c b/sound/soc/msm/msm8998.c
index 9c392f3d4ddc..94a529acaff7 100644
--- a/sound/soc/msm/msmcobalt.c
+++ b/sound/soc/msm/msm8998.c
@@ -40,9 +40,9 @@
 #include "../codecs/wcd934x/wcd934x-mbhc.h"
 #include "../codecs/wsa881x.h"
 
-#define DRV_NAME "msmcobalt-asoc-snd"
+#define DRV_NAME "msm8998-asoc-snd"
 
-#define __CHIPSET__ "MSMCOBALT "
+#define __CHIPSET__ "MSM8998 "
 #define MSM_DAILINK_NAME(name) (__CHIPSET__#name)
 
 #define SAMPLING_RATE_8KHZ      8000
@@ -3108,7 +3108,7 @@ err_fail:
 	return ret;
 }
 
-static int msmcobalt_notifier_service_cb(struct notifier_block *this,
+static int msm8998_notifier_service_cb(struct notifier_block *this,
 					 unsigned long opcode, void *ptr)
 {
 	int ret;
@@ -3166,7 +3166,7 @@ done:
 }
 
 static struct notifier_block service_nb = {
-	.notifier_call  = msmcobalt_notifier_service_cb,
+	.notifier_call  = msm8998_notifier_service_cb,
 	.priority = -INT_MAX,
 };
 
@@ -5824,12 +5824,12 @@ err_pcm_runtime:
 }
 
 struct snd_soc_card snd_soc_card_tasha_msm = {
-	.name		= "msmcobalt-tasha-snd-card",
+	.name		= "msm8998-tasha-snd-card",
 	.late_probe	= msm_snd_card_late_probe,
 };
 
 struct snd_soc_card snd_soc_card_tavil_msm = {
-	.name		= "msmcobalt-tavil-snd-card",
+	.name		= "msm8998-tavil-snd-card",
 	.late_probe	= msm_snd_card_tavil_late_probe,
 };
 
@@ -6089,15 +6089,15 @@ static struct snd_soc_dai_link msm_stub_dai_links[
 			 ARRAY_SIZE(msm_stub_be_dai_links)];
 
 struct snd_soc_card snd_soc_card_stub_msm = {
-	.name		= "msmcobalt-stub-snd-card",
+	.name		= "msm8998-stub-snd-card",
 };
 
-static const struct of_device_id msmcobalt_asoc_machine_of_match[]  = {
-	{ .compatible = "qcom,msmcobalt-asoc-snd-tasha",
+static const struct of_device_id msm8998_asoc_machine_of_match[]  = {
+	{ .compatible = "qcom,msm8998-asoc-snd-tasha",
 	  .data = "tasha_codec"},
-	{ .compatible = "qcom,msmcobalt-asoc-snd-tavil",
+	{ .compatible = "qcom,msm8998-asoc-snd-tavil",
 	  .data = "tavil_codec"},
-	{ .compatible = "qcom,msmcobalt-asoc-snd-stub",
+	{ .compatible = "qcom,msm8998-asoc-snd-stub",
 	  .data = "stub_codec"},
 	{},
 };
@@ -6110,7 +6110,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
 	int total_links;
 	const struct of_device_id *match;
 
-	match = of_match_node(msmcobalt_asoc_machine_of_match, dev->of_node);
+	match = of_match_node(msm8998_asoc_machine_of_match, dev->of_node);
 	if (!match) {
 		dev_err(dev, "%s: No DT match found for sound card\n",
 			__func__);
@@ -6590,7 +6590,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	match = of_match_node(msmcobalt_asoc_machine_of_match,
+	match = of_match_node(msm8998_asoc_machine_of_match,
 			pdev->dev.of_node);
 	if (!match) {
 		dev_err(&pdev->dev, "%s: no matched codec is found.\n",
@@ -6710,7 +6710,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 	i2s_auxpcm_init(pdev);
 
 	is_initial_boot = true;
-	ret = audio_notifier_register("msmcobalt", AUDIO_NOTIFIER_ADSP_DOMAIN,
+	ret = audio_notifier_register("msm8998", AUDIO_NOTIFIER_ADSP_DOMAIN,
 				      &service_nb);
 	if (ret < 0)
 		pr_err("%s: Audio notifier register failed ret = %d\n",
@@ -6755,19 +6755,19 @@ static int msm_asoc_machine_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct platform_driver msmcobalt_asoc_machine_driver = {
+static struct platform_driver msm8998_asoc_machine_driver = {
 	.driver = {
 		.name = DRV_NAME,
 		.owner = THIS_MODULE,
 		.pm = &snd_soc_pm_ops,
-		.of_match_table = msmcobalt_asoc_machine_of_match,
+		.of_match_table = msm8998_asoc_machine_of_match,
 	},
 	.probe = msm_asoc_machine_probe,
 	.remove = msm_asoc_machine_remove,
 };
-module_platform_driver(msmcobalt_asoc_machine_driver);
+module_platform_driver(msm8998_asoc_machine_driver);
 
 MODULE_DESCRIPTION("ALSA SoC msm");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRV_NAME);
-MODULE_DEVICE_TABLE(of, msmcobalt_asoc_machine_of_match);
+MODULE_DEVICE_TABLE(of, msm8998_asoc_machine_of_match);