ALSA: hda: intel-dsp-config: reorder the config table

Entries without dmi_table nor codec_hid field need to be placed after
entries with these two fields or they will be always selected.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20220113105220.1114694-3-brent.lu@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 3a3026fa4a17393c8a0e969c3029c30287c450b5..4fb90ceb4053b7f45d34e1177f20c7cb79fe2d70 100644 (file)
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -249,13 +249,13 @@ static const struct config_entry config_table[] = {
                }
        },
        {
-               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+               .flags = FLAG_SOF,
                .device = 0x02c8,
+               .codec_hid = "ESSX8336",
        },
        {
-               .flags = FLAG_SOF,
+               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
                .device = 0x02c8,
-               .codec_hid = "ESSX8336",
        },
 /* Cometlake-H */
        {
@@ -278,14 +278,14 @@ static const struct config_entry config_table[] = {
                }
        },
        {
-               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
-               .device = 0x06c8,
-       },
-               {
                .flags = FLAG_SOF,
                .device = 0x06c8,
                .codec_hid = "ESSX8336",
        },
+       {
+               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+               .device = 0x06c8,
+       },
 #endif
 
 /* Icelake */
@@ -351,17 +351,17 @@ static const struct config_entry config_table[] = {
                }
        },
        {
-               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+               .flags = FLAG_SOF,
                .device = 0xa0c8,
+               .codec_hid = "ESSX8336",
        },
        {
                .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
-               .device = 0x43c8,
+               .device = 0xa0c8,
        },
        {
-               .flags = FLAG_SOF,
-               .device = 0xa0c8,
-               .codec_hid = "ESSX8336",
+               .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
+               .device = 0x43c8,
        },
 #endif