Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...

ASoC: Fixes for v5.1

A few core fixes along with the driver specific ones, mainly fixing
small issues that only affect x86 platforms for various reasons (their
unusual machine enumeration mechanisms mainly, plus a fix for error
handling in topology).

There's some of the driver fixes that look larger than they are, like
the hdmi-codec changes which resulted in an indentation change, and most
of the other large changes are for new drivers like the STM32 changes.

diff --combined sound/hda/hdac_component.c
index 6b5caee61c6e024f059a74772028eceeef055e56,5c95933e739a43bc5cd30829e43c0381cff1e989..1ea51e3b942a034a1b487bb2ad7dc054893a4d39
--- 1/sound/hda/hdac_component.c
--- 2/sound/hda/hdac_component.c
+++ b/sound/hda/hdac_component.c
@@@ -69,15 -69,13 +69,15 @@@ void snd_hdac_display_power(struct hdac
  
        dev_dbg(bus->dev, "display power %s\n",
                enable ? "enable" : "disable");
 +
 +      mutex_lock(&bus->lock);
        if (enable)
                set_bit(idx, &bus->display_power_status);
        else
                clear_bit(idx, &bus->display_power_status);
  
        if (!acomp || !acomp->ops)
 -              return;
 +              goto unlock;
  
        if (bus->display_power_status) {
                if (!bus->display_power_active) {
@@@ -94,8 -92,6 +94,8 @@@
                        bus->display_power_active = false;
                }
        }
 + unlock:
 +      mutex_unlock(&bus->lock);
  }
  EXPORT_SYMBOL_GPL(snd_hdac_display_power);
  
@@@ -273,7 -269,7 +273,7 @@@ EXPORT_SYMBOL_GPL(snd_hdac_acomp_regist
   */
  int snd_hdac_acomp_init(struct hdac_bus *bus,
                        const struct drm_audio_component_audio_ops *aops,
-                       int (*match_master)(struct device *, void *),
+                       int (*match_master)(struct device *, int, void *),
                        size_t extra_size)
  {
        struct component_match *match = NULL;
@@@ -292,7 -288,7 +292,7 @@@
        bus->audio_component = acomp;
        devres_add(dev, acomp);
  
-       component_match_add(dev, &match, match_master, bus);
+       component_match_add_typed(dev, &match, match_master, bus);
        ret = component_master_add_with_match(dev, &hdac_component_master_ops,
                                              match);
        if (ret < 0)