ASoC: Intel: sof_da7219: support MAX98390 on cml boards

For cml boards, MAX98390 speaker amplifier is supported by machine
driver bxt_da7219_max98357a with sound card name cml_max98390_da7219.
Use same name for backward compatibility with existing devices on
market.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240426152529.38345-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_da7219.c b/sound/soc/intel/boards/sof_da7219.c
index 69555eee7c7a92dff22b2c0f53ea9a33a6c26df4..0abb71a10a72679d6442945bf16c4103f4b2f395 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -313,6 +313,7 @@ static int audio_probe(struct platform_device *pdev)
 {
        struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
        struct sof_card_private *ctx;
+       char *card_name;
        unsigned long board_quirk = 0;
        int ret;
 
@@ -332,6 +333,21 @@ static int audio_probe(struct platform_device *pdev)
        if (board_quirk & SOF_DA7219_CML_BOARD) {
                /* overwrite the DAI link order for CML boards */
                ctx->link_order_overwrite = CML_LINK_ORDER;
+
+               /* backward-compatible with existing devices */
+               switch (ctx->amp_type) {
+               case CODEC_MAX98390:
+                       card_name = devm_kstrdup(&pdev->dev,
+                                                "cml_max98390_da7219",
+                                                GFP_KERNEL);
+                       if (!card_name)
+                               return -ENOMEM;
+
+                       card_da7219.name = card_name;
+                       break;
+               default:
+                       break;
+               }
        } else if (board_quirk & SOF_DA7219_JSL_BOARD) {
                ctx->da7219.is_jsl_board = true;
 
@@ -341,13 +357,20 @@ static int audio_probe(struct platform_device *pdev)
                /* backward-compatible with existing devices */
                switch (ctx->amp_type) {
                case CODEC_MAX98360A:
-                       card_da7219.name = devm_kstrdup(&pdev->dev,
-                                                       "da7219max98360a",
-                                                       GFP_KERNEL);
+                       card_name = devm_kstrdup(&pdev->dev, "da7219max98360a",
+                                                GFP_KERNEL);
+                       if (!card_name)
+                               return -ENOMEM;
+
+                       card_da7219.name = card_name;
                        break;
                case CODEC_MAX98373:
-                       card_da7219.name = devm_kstrdup(&pdev->dev, "da7219max",
-                                                       GFP_KERNEL);
+                       card_name = devm_kstrdup(&pdev->dev, "da7219max",
+                                                GFP_KERNEL);
+                       if (!card_name)
+                               return -ENOMEM;
+
+                       card_da7219.name = card_name;
                        break;
                default:
                        break;