diff options
| author | Bard Liao <yung-chuan.liao@linux.intel.com> | 2024-08-27 14:32:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-08-28 14:01:54 +0200 |
| commit | 5458411d75947a4212e50a401ec0a98d4c6c931b (patch) | |
| tree | 406a320b1f47e71ccbe716c1b332461d69735f0b /sound/soc/intel | |
| parent | ASoC: Intel: boards: always check the result of acpi_dev_get_first_match_dev() (diff) | |
| download | linux-5458411d75947a4212e50a401ec0a98d4c6c931b.tar.xz linux-5458411d75947a4212e50a401ec0a98d4c6c931b.zip | |
ASoC: SOF: Intel: hda: refactoring topology name fixup for HDA mach
Move I2S mach's topology name fixup code to the end of machine driver
enumeration flow so HDA mach could also use same code to fixup its
topology file name as well. No functional change in this commit.
Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240827123215.258859-5-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-hda-match.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-hda-match.c b/sound/soc/intel/common/soc-acpi-intel-hda-match.c index 007ccd8a60e5..e93336e27beb 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hda-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hda-match.c @@ -13,16 +13,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[] = { { /* .id is not used in this file */ .drv_name = "skl_hda_dsp_generic", - - /* .fw_filename is dynamically set in skylake driver */ - - .sof_tplg_filename = "sof-hda-generic.tplg", - - /* - * .machine_quirk and .quirk_data are not used here but - * can be used if we need a more complicated machine driver - * combining HDA+other device (e.g. DMIC). - */ + .sof_tplg_filename = "sof-hda-generic", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, }, {}, }; |