]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: Intel: soc-acpi: Fix machine selection order
authorSathya Prakash M R <sathya.prakash.m.r@intel.com>
Sat, 18 May 2019 18:30:08 +0000 (13:30 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 20 May 2019 14:17:10 +0000 (15:17 +0100)
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>
sound/soc/intel/common/soc-acpi-intel-cnl-match.c

index df7c52cad5c3f660ff0da320bce076b892fdf6ff..c36c0aa4f683250a18085d8adeb28779ec86099d 100644 (file)
@@ -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",
        },
 
        {},