ASoC: Intel: avs: es8336: Validate machine board configuration

Allow for board to be used with TDMs.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20231012083514.492626-11-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c
index 6d2a7c8..f972ef6 100644 (file)
--- a/sound/soc/intel/avs/boards/es8336.c
+++ b/sound/soc/intel/avs/boards/es8336.c
@@ -19,6 +19,7 @@
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
 #include <asm/intel-family.h>
+#include "../utils.h"
 
 #define ES8336_CODEC_DAI       "ES8316 HiFi"
 
@@ -194,7 +195,7 @@ static int avs_es8336_be_fixup(struct snd_soc_pcm_runtime *runtime,
        return 0;
 }
 static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,
-                              struct snd_soc_dai_link **dai_link)
+                              int tdm_slot, struct snd_soc_dai_link **dai_link)
 {
        struct snd_soc_dai_link_component *platform;
        struct snd_soc_dai_link *dl;
@@ -206,13 +207,15 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
 
        platform->name = platform_name;
 
-       dl->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_port);
+       dl->name = devm_kasprintf(dev, GFP_KERNEL,
+                                 AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));
        dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
        dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs), GFP_KERNEL);
        if (!dl->name || !dl->cpus || !dl->codecs)
                return -ENOMEM;
 
-       dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port);
+       dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
+                                           AVS_STRING_FMT("SSP", " Pin", ssp_port, tdm_slot));
        dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-ESSX8336:00");
        dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, ES8336_CODEC_DAI);
        if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
@@ -261,13 +264,16 @@ static int avs_es8336_probe(struct platform_device *pdev)
        struct snd_soc_card *card;
        struct device *dev = &pdev->dev;
        const char *pname;
-       int ssp_port, ret;
+       int ssp_port, tdm_slot, ret;
 
        mach = dev_get_platdata(dev);
        pname = mach->mach_params.platform;
-       ssp_port = __ffs(mach->mach_params.i2s_link_mask);
 
-       ret = avs_create_dai_link(dev, pname, ssp_port, &dai_link);
+       ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);
+       if (ret)
+               return ret;
+
+       ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);
        if (ret) {
                dev_err(dev, "Failed to create dai link: %d", ret);
                return ret;