diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:02 +0100 |
| commit | ffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch) | |
| tree | c5216df939963608cefcd94bdf2934a2b880b54d /sound/soc/sof/intel/bdw.c | |
| parent | d143a69fd452a047440391fcbe290ff416b14ab5 (diff) | |
| parent | 25c4a9b614f101bb9f3e687960815db7dc439c0f (diff) | |
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'sound/soc/sof/intel/bdw.c')
| -rw-r--r-- | sound/soc/sof/intel/bdw.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c index fd5ae628732d..89a6c1f04a55 100644 --- a/sound/soc/sof/intel/bdw.c +++ b/sound/soc/sof/intel/bdw.c @@ -559,12 +559,16 @@ static void bdw_machine_select(struct snd_sof_dev *sdev) } static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach, - struct device *dev) + 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(dev); + 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 */ |