Revert "ASoC: SOF: Intel: hda-dai-ops: reset device count for SoundWire DAIs"

This reverts commit 699e146d9ebf42ee2a5d4e4e28f7a49c4aef0105.
Don't reset device_count as we will use the multi-gateway firmware
configuration.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240402151828.175002-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c
index c50ca9e72d37385816ddb3cd6ef7456ed50a58e9..d3e168ad11804489056e6bc7f611ab6d27e3921b 100644 (file)
--- a/sound/soc/sof/intel/hda-dai-ops.c
+++ b/sound/soc/sof/intel/hda-dai-ops.c
@@ -435,28 +435,6 @@ out:
        return ret;
 }
 
-static struct hdac_ext_stream *sdw_hda_ipc4_get_hext_stream(struct snd_sof_dev *sdev,
-                                                           struct snd_soc_dai *cpu_dai,
-                                                           struct snd_pcm_substream *substream)
-{
-       struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(cpu_dai, substream->stream);
-       struct snd_sof_widget *swidget = w->dobj.private;
-       struct snd_sof_dai *dai = swidget->private;
-       struct sof_ipc4_copier *ipc4_copier = dai->private;
-       struct sof_ipc4_alh_configuration_blob *blob;
-
-       blob = (struct sof_ipc4_alh_configuration_blob *)ipc4_copier->copier_config;
-
-       /*
-        * Starting with ACE_2_0, re-setting the device_count is mandatory to avoid using
-        * the multi-gateway firmware configuration. The DMA hardware can take care of
-        * multiple links without needing any firmware assistance
-        */
-       blob->alh_cfg.device_count = 1;
-
-       return hda_ipc4_get_hext_stream(sdev, cpu_dai, substream);
-}
-
 static const struct hda_dai_widget_dma_ops hda_ipc4_dma_ops = {
        .get_hext_stream = hda_ipc4_get_hext_stream,
        .assign_hext_stream = hda_assign_hext_stream,
@@ -498,7 +476,7 @@ static const struct hda_dai_widget_dma_ops dmic_ipc4_dma_ops = {
 };
 
 static const struct hda_dai_widget_dma_ops sdw_ipc4_dma_ops = {
-       .get_hext_stream = sdw_hda_ipc4_get_hext_stream,
+       .get_hext_stream = hda_ipc4_get_hext_stream,
        .assign_hext_stream = hda_assign_hext_stream,
        .release_hext_stream = hda_release_hext_stream,
        .setup_hext_stream = hda_setup_hext_stream,