Commit 081c7370 authored by Brent Lu's avatar Brent Lu Committed by Takashi Iwai

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: default avatarBrent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20220113105220.1114694-3-brent.lu@intel.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 19980aa1
...@@ -249,13 +249,13 @@ static const struct config_entry config_table[] = { ...@@ -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, .device = 0x02c8,
.codec_hid = "ESSX8336",
}, },
{ {
.flags = FLAG_SOF, .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x02c8, .device = 0x02c8,
.codec_hid = "ESSX8336",
}, },
/* Cometlake-H */ /* Cometlake-H */
{ {
...@@ -278,14 +278,14 @@ static const struct config_entry config_table[] = { ...@@ -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, .flags = FLAG_SOF,
.device = 0x06c8, .device = 0x06c8,
.codec_hid = "ESSX8336", .codec_hid = "ESSX8336",
}, },
{
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x06c8,
},
#endif #endif
/* Icelake */ /* Icelake */
...@@ -351,17 +351,17 @@ static const struct config_entry config_table[] = { ...@@ -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, .device = 0xa0c8,
.codec_hid = "ESSX8336",
}, },
{ {
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x43c8, .device = 0xa0c8,
}, },
{ {
.flags = FLAG_SOF, .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0xa0c8, .device = 0x43c8,
.codec_hid = "ESSX8336",
}, },
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment