ASoC: Intel: avs: boards: Change pcm3168a card name
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Mon, 7 Apr 2025 12:41:46 +0000 (14:41 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 7 Apr 2025 14:04:13 +0000 (15:04 +0100)
Rename FE from "avs_pcm3168a" to "AVS I2S PCM3168A".

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-13-amadeuszx.slawinski@linux.intel.com
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/avs/boards/pcm3168a.c

index 5d0e7a5bdc7494eab0ae347cf6ec0ba8c68ed014..1ebbc92df6b636f1fbd9434f13b89a433c101853 100644 (file)
@@ -11,6 +11,8 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include "../utils.h"
 
 static const struct snd_soc_dapm_widget card_widgets[] = {
        SND_SOC_DAPM_HP("CPB Stereo HP 1", NULL),
@@ -95,10 +97,15 @@ static int avs_create_dai_links(struct device *dev, struct snd_soc_dai_link **li
 
 static int avs_pcm3168a_probe(struct platform_device *pdev)
 {
+       struct snd_soc_acpi_mach *mach;
+       struct avs_mach_pdata *pdata;
        struct device *dev = &pdev->dev;
        struct snd_soc_card *card;
        int ret;
 
+       mach = dev_get_platdata(dev);
+       pdata = mach->pdata;
+
        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
        if (!card)
                return -ENOMEM;
@@ -107,7 +114,12 @@ static int avs_pcm3168a_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       card->name = "avs_pcm3168a";
+       if (pdata->obsolete_card_names) {
+               card->name = "avs_pcm3168a";
+       } else {
+               card->driver_name = "avs_pcm3168a";
+               card->long_name = card->name = "AVS I2S PCM3168A";
+       }
        card->dev = dev;
        card->owner = THIS_MODULE;
        card->dapm_widgets = card_widgets;