diff options
| author | Sathya Prakash M R <sathya.prakash.m.r@intel.com> | 2019-05-18 13:30:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-20 15:17:10 +0100 |
| commit | 30d9d4ff53532087bc13ed29d7715df868794b5e (patch) | |
| tree | 3a2518b62dac4a2b8775290e3be09fc5024739b8 /sound/soc/intel | |
| parent | 7b8164c1a29ce8ef91672c50ceac5c14475f5601 (diff) | |
| download | linux-30d9d4ff53532087bc13ed29d7715df868794b5e.tar.bz2 | |
ASoC: Intel: soc-acpi: Fix machine selection order
The selection order of m/c in match table is corrected
to use common codec as last in the list.
Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@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-cnl-match.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c index df7c52cad5c3..c36c0aa4f683 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c @@ -29,17 +29,17 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = { .sof_tplg_filename = "sof-cnl-rt274.tplg", }, { - .id = "10EC5682", + .id = "MX98357A", .drv_name = "sof_rt5682", + .quirk_data = &cml_codecs, .sof_fw_filename = "sof-cnl.ri", - .sof_tplg_filename = "sof-cml-rt5682.tplg", + .sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg", }, { - .id = "MX98357A", + .id = "10EC5682", .drv_name = "sof_rt5682", - .quirk_data = &cml_codecs, .sof_fw_filename = "sof-cnl.ri", - .sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg", + .sof_tplg_filename = "sof-cml-rt5682.tplg", }, {}, |