From: Mark Brown <broonie@kernel.org>
Date: Mon, 29 Jun 2020 19:47:01 +0000 (+0100)
Subject: Merge branch 'for-5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.9-rc1~22^2~22^2^2~126
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=351cf7445f009d7c4edcecdaf7cdee8f33046164;p=linux-block.git

Merge branch 'for-5.8' of https://git./linux/kernel/git/broonie/sound into asoc-5.9
---

351cf7445f009d7c4edcecdaf7cdee8f33046164
diff --cc sound/hda/intel-dsp-config.c
index 20b8f6cb3ff8,5df0d2253844..99aec7349167
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@@ -237,33 -208,12 +237,31 @@@ static const struct config_entry config
  		}
  	},
  	{
 -		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
 +		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
  		.device = 0x02c8,
  	},
- #endif
  /* Cometlake-H */
- #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)
  	{
 -		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
 +		.flags = FLAG_SOF,
 +		.device = 0x06c8,
 +		.dmi_table = (const struct dmi_system_id []) {
 +			{
 +				.matches = {
 +					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
 +					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
 +				},
 +			},
 +			{
 +				.matches = {
 +					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
 +					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
 +				},
 +			},
 +			{}
 +		}
 +	},
 +	{
 +		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
  		.device = 0x06c8,
  	},
  #endif