Merge branch 'for-5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/hda/intel-dsp-config.c
index 20b8f6c,5df0d22..99aec73
--- 1/sound/hda/intel-dsp-config.c
--- 2/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

diff --cc sound/soc/codecs/rt5670.c
Simple merge

diff --cc sound/soc/codecs/rt5682.c
Simple merge

diff --cc sound/soc/intel/boards/Kconfig
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_rt5672.c
Simple merge

diff --cc sound/soc/qcom/Kconfig
Simple merge