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

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.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 19980aa1

sound/hda/intel-dsp-config.c

+12 −12
Original line number Diff line number Diff line
@@ -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,13 +278,13 @@ static const struct config_entry config_table[] = { 
		}

	},

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.flags = FLAG_SOF,

		.device = 0x06c8,

		.codec_hid = "ESSX8336",

	},

	{

		.flags = FLAG_SOF,

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x06c8,

		.codec_hid = "ESSX8336",

	},

#endif
@@ -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