]> Git Repo - linux.git/commitdiff
Merge tag 'asoc-fix-v5.8-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorTakashi Iwai <[email protected]>
Mon, 22 Jun 2020 11:49:14 +0000 (13:49 +0200)
committerTakashi Iwai <[email protected]>
Mon, 22 Jun 2020 11:49:14 +0000 (13:49 +0200)
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.

1  2 
include/sound/soc.h
sound/hda/intel-dsp-config.c

Simple merge
index 20b8f6cb3ff8e615723a9679a1d35324f5e92b3b,5df0d225384472d59e0f5d7c88e0e66dc916f1e6..99aec73491676f1b7ba36b10d513573b5275da5a
@@@ -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
This page took 0.089232 seconds and 4 git commands to generate.