ASoC: Intel: avs: max98373: 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-12-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c
index 7820435e3a53efe0d8317c61f3fefe38451bab9e..cc7dfdf72083221cb4ab7d0ec687c5c6983a32cc 100644 (file)
--- a/sound/soc/intel/avs/boards/max98373.c
+++ b/sound/soc/intel/avs/boards/max98373.c
@@ -12,6 +12,7 @@
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
 #include <sound/soc-dapm.h>
+#include "../utils.h"
 
 #define MAX98373_DEV0_NAME     "i2c-MX98373:00"
 #define MAX98373_DEV1_NAME     "i2c-MX98373:01"
@@ -95,7 +96,7 @@ static const struct snd_soc_ops avs_max98373_ops = {
 };
 
 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;
@@ -107,13 +108,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) * 2, 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[0].name = devm_kasprintf(dev, GFP_KERNEL, MAX98373_DEV0_NAME);
        dl->codecs[0].dai_name = devm_kasprintf(dev, GFP_KERNEL, MAX98373_CODEC_NAME);
        dl->codecs[1].name = devm_kasprintf(dev, GFP_KERNEL, MAX98373_DEV1_NAME);
@@ -148,13 +151,16 @@ static int avs_max98373_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;