ASoC: Intel: avs: Only create SSP%d snd_soc_dai_driver when requested

When using TDM configuration some other device may be using SSP%d, so
don't create snd_soc_dai_driver configuration for it unless requested
by TDM configuration.

While at it adjust tdf8532 board to explicitly describe TDM
configuration.

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

diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
index 59a13feec57b2543d8f22d84c358ffd69d527e66..c10fff70549601f5976ba975cd187086fdcda297 100644 (file)
--- a/sound/soc/intel/avs/board_selection.c
+++ b/sound/soc/intel/avs/board_selection.c
@@ -193,7 +193,7 @@ static struct snd_soc_acpi_mach avs_apl_i2s_machines[] = {
                .mach_params = {
                        .i2s_link_mask = AVS_SSP_RANGE(0, 5),
                },
-               .pdata = (unsigned long[]){ 0, 0, 0x14, 0, 0, 0 }, /* SSP2 TDMs */
+               .pdata = (unsigned long[]){ 0x1, 0x1, 0x14, 0x1, 0x1, 0x1 }, /* SSP2 TDMs */
                .tplg_filename = "tdf8532-tplg.bin",
        },
        {

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index 5b31203bd56a105143455da14692ec60271096e8..bea66e6bd4388e3a541f0505b9032619b020d69f 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -1238,7 +1238,11 @@ int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned l
        int i, j;
 
        ssp_count = adev->hw_cfg.i2s_caps.ctrl_count;
-       cpu_count = hweight_long(port_mask);
+
+       cpu_count = 0;
+       for_each_set_bit(i, &port_mask, ssp_count)
+               if (!tdms || test_bit(0, &tdms[i]))
+                       cpu_count++;
        if (tdms)
                for_each_set_bit(i, &port_mask, ssp_count)
                        cpu_count += hweight_long(tdms[i]);
@@ -1249,18 +1253,20 @@ int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned l
 
        dai = cpus;
        for_each_set_bit(i, &port_mask, ssp_count) {
-               memcpy(dai, &i2s_dai_template, sizeof(*dai));
+               if (!tdms || test_bit(0, &tdms[i])) {
+                       memcpy(dai, &i2s_dai_template, sizeof(*dai));
 
-               dai->name =
-                       devm_kasprintf(adev->dev, GFP_KERNEL, "SSP%d Pin", i);
-               dai->playback.stream_name =
-                       devm_kasprintf(adev->dev, GFP_KERNEL, "ssp%d Tx", i);
-               dai->capture.stream_name =
-                       devm_kasprintf(adev->dev, GFP_KERNEL, "ssp%d Rx", i);
+                       dai->name =
+                               devm_kasprintf(adev->dev, GFP_KERNEL, "SSP%d Pin", i);
+                       dai->playback.stream_name =
+                               devm_kasprintf(adev->dev, GFP_KERNEL, "ssp%d Tx", i);
+                       dai->capture.stream_name =
+                               devm_kasprintf(adev->dev, GFP_KERNEL, "ssp%d Rx", i);
 
-               if (!dai->name || !dai->playback.stream_name || !dai->capture.stream_name)
-                       return -ENOMEM;
-               dai++;
+                       if (!dai->name || !dai->playback.stream_name || !dai->capture.stream_name)
+                               return -ENOMEM;
+                       dai++;
+               }
        }
 
        if (!tdms)