ASoC: SOF: Intel: update set_mach_params()

Add information for num_dai_drivers and dai_drivers[], which will be
used in the refactored nocodec implementation

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210409220121.1542362-5-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 28e049a..89a6c1f 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -561,10 +561,14 @@ static void bdw_machine_select(struct snd_sof_dev *sdev)
 static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach,
                                struct snd_sof_dev *sdev)
 {
+       struct snd_sof_pdata *pdata = sdev->pdata;
+       const struct sof_dev_desc *desc = pdata->desc;
        struct snd_soc_acpi_mach_params *mach_params;
 
        mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;
        mach_params->platform = dev_name(sdev->dev);
+       mach_params->num_dai_drivers = desc->ops->num_drv;
+       mach_params->dai_drivers = desc->ops->drv;
 }
 
 /* Broadwell DAIs */

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index bed26d9..d9803e2 100644 (file)
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -500,10 +500,14 @@ static struct snd_soc_dai_driver byt_dai[] = {
 static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach,
                                struct snd_sof_dev *sdev)
 {
+       struct snd_sof_pdata *pdata = sdev->pdata;
+       const struct sof_dev_desc *desc = pdata->desc;
        struct snd_soc_acpi_mach_params *mach_params;
 
        mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;
        mach_params->platform = dev_name(sdev->dev);
+       mach_params->num_dai_drivers = desc->ops->num_drv;
+       mach_params->dai_drivers = desc->ops->drv;
 }
 
 /*

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 065b852..b00e8fc 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1215,10 +1215,14 @@ static int hda_sdw_machine_select(struct snd_sof_dev *sdev)
 void hda_set_mach_params(const struct snd_soc_acpi_mach *mach,
                         struct snd_sof_dev *sdev)
 {
+       struct snd_sof_pdata *pdata = sdev->pdata;
+       const struct sof_dev_desc *desc = pdata->desc;
        struct snd_soc_acpi_mach_params *mach_params;
 
        mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;
        mach_params->platform = dev_name(sdev->dev);
+       mach_params->num_dai_drivers = desc->ops->num_drv;
+       mach_params->dai_drivers = desc->ops->drv;
 }
 
 void hda_machine_select(struct snd_sof_dev *sdev)