From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 22 Jun 2020 11:49:14 +0000 (+0200)
Subject: Merge tag 'asoc-fix-v5.8-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=91ef3d9f9fef08e3f42b78ec0ae8187be1070fce;p=uclinux-h8%2Flinux.git

Merge tag 'asoc-fix-v5.8-rc2' of https://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.8

This is a collection of mostly small fixes, mostly fixing fallout from
some of the DPCM changes that went in last time around which shook out
some issues on i.MX and Qualcomm platforms.  The addition of a managed
version of snd_soc_register_dai() is to fix resource leaks.

There's also a few new device IDs for x86 systems.
---

91ef3d9f9fef08e3f42b78ec0ae8187be1070fce
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