ASoC: Intel: avs: boards: Change DMIC card name

Rename FE from "avs_dmic" to "AVS DMIC".

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Link: https://patch.msgid.link/20250407124154.1713039-5-amadeuszx.slawinski@linux.intel.com
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c
index 4dd9591ee98b7596e6cbfb35a2b697c887a87579..cda2ddb28add3602f94afc8adc9f8555256602da 100644 (file)
--- a/sound/soc/intel/avs/boards/dmic.c
+++ b/sound/soc/intel/avs/boards/dmic.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
+#include "../utils.h"
 
 SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));
 SND_SOC_DAILINK_DEF(dmic_wov_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC WoV Pin")));
@@ -49,17 +50,24 @@ static const struct snd_soc_dapm_route card_routes[] = {
 static int avs_dmic_probe(struct platform_device *pdev)
 {
        struct snd_soc_acpi_mach *mach;
+       struct avs_mach_pdata *pdata;
        struct snd_soc_card *card;
        struct device *dev = &pdev->dev;
        int ret;
 
        mach = dev_get_platdata(dev);
+       pdata = mach->pdata;
 
        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
        if (!card)
                return -ENOMEM;
 
-       card->name = "avs_dmic";
+       if (pdata->obsolete_card_names) {
+               card->name = "avs_dmic";
+       } else {
+               card->driver_name = "avs_dmic";
+               card->long_name = card->name = "AVS DMIC";
+       }
        card->dev = dev;
        card->owner = THIS_MODULE;
        card->dai_link = card_dai_links;