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

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-17-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/rt298.c

index a7a463d6f852123c12968242512687a5fe12f286..a7b4973cd481b6f7e2e33eed14052f281950e2c0 100644 (file)
@@ -199,6 +199,7 @@ static int avs_rt298_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 snd_soc_jack *jack;
        struct device *dev = &pdev->dev;
@@ -207,6 +208,7 @@ static int avs_rt298_probe(struct platform_device *pdev)
 
        mach = dev_get_platdata(dev);
        pname = mach->mach_params.platform;
+       pdata = mach->pdata;
 
        ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);
        if (ret)
@@ -223,7 +225,12 @@ static int avs_rt298_probe(struct platform_device *pdev)
        if (!jack || !card)
                return -ENOMEM;
 
-       card->name = "avs_rt298";
+       if (pdata->obsolete_card_names) {
+               card->name = "avs_rt298";
+       } else {
+               card->driver_name = "avs_rt298";
+               card->long_name = card->name = "AVS I2S ALC298";
+       }
        card->dev = dev;
        card->owner = THIS_MODULE;
        card->suspend_pre = avs_card_suspend_pre;