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

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-8-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/i2s_test.c

index 4556f105c793eb40018a4f1310c9d356ef33a742..8b6168ba87f41b9204de953495a67ea1fe6c2bde 100644 (file)
@@ -56,6 +56,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev)
 {
        struct snd_soc_dai_link *dai_link;
        struct snd_soc_acpi_mach *mach;
+       struct avs_mach_pdata *pdata;
        struct snd_soc_card *card;
        struct device *dev = &pdev->dev;
        const char *pname;
@@ -63,6 +64,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev)
 
        mach = dev_get_platdata(dev);
        pname = mach->mach_params.platform;
+       pdata = mach->pdata;
 
        if (!avs_mach_singular_ssp(mach)) {
                dev_err(dev, "Invalid SSP configuration\n");
@@ -80,8 +82,15 @@ static int avs_i2s_test_probe(struct platform_device *pdev)
        if (!card)
                return -ENOMEM;
 
-       card->name = devm_kasprintf(dev, GFP_KERNEL,
-                                   AVS_STRING_FMT("ssp", "-loopback", ssp_port, tdm_slot));
+       if (pdata->obsolete_card_names) {
+               card->name = devm_kasprintf(dev, GFP_KERNEL,
+                                           AVS_STRING_FMT("ssp", "-loopback", ssp_port, tdm_slot));
+       } else {
+               card->driver_name = "avs_i2s_test";
+               card->long_name = card->name = devm_kasprintf(dev, GFP_KERNEL,
+                                                             AVS_STRING_FMT("AVS I2S TEST-", "",
+                                                                            ssp_port, tdm_slot));
+       }
        if (!card->name)
                return -ENOMEM;