Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

Pull sound updates from Takashi Iwai:
 "As the diffstat shows, we've had lots of developments in a wide range
  at this time; the majority of changes are about ASoC, including
  subsystem-wide cleanups, continued SOF / Intel updates and a bunch of
  new drivers (as usual), while there have been some significant (but
  almost invisible) improvements in ALSA core side, too.

  Below are some highlights:

  Core:

   - Faster lookups of control elements with Xarray; normal user won't
     notice, but on the devices with tons of control elements, it can be
     visibly faster

   - Support for input validation for controls; this will harden for
     badly written drivers in general with a slight overhead

   - Deferred async signal handling for working around the potential
     deadlocks

   - Cleanup / refactoring raw MIDI locking code

  ASoC:

   - Restructing of the set_fmt() callbacks for making things clearer in
     situations like CODEC to CODEC links

   - Clean up and modernizing the DAI naming scheme setups

   - Merge of more of the Intel AVS driver stack, including some board
     integrations

   - New version 4 mechanism for communication with SOF DSPs

   - Suppoort for dynamically selecting the PLL to use at runtime on
     i.MX platforms

   - Improvements for CODEC to CODEC support in the generic cards

   - Support for AMD Jadeite and various machines, AMD RPL, Intel
     MetorLake DSPs, Mediatek MT8186 DSPs and MT6366, nVidia Tegra
     MDDRC, OPE and PEQ, NXP TFA9890, Qualcomm SDM845, WCD9335 and
     WAS883x, and Texas Instruments TAS2780

  HD- and USB-audio:

   - Continued improvement for CS35L41 (sub)codec support

   - More quirks for various devices (HP, Lenovo, Dell, Clevo)"

* tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (778 commits)
  ALSA: hda/realtek: Add quirk for HP Spectre x360 15-eb0xxx
  ALSA: line6: Replace sprintf() with sysfs_emit()
  ALSA: hda: Replace sprintf() with sysfs_emit()
  ALSA: pcm: Replace sprintf() with sysfs_emit()
  ALSA: core: Replace scnprintf() with sysfs_emit()
  ALSA: control-led: Replace sprintf() with sysfs_emit()
  ALSA: aoa: Replace sprintf() with sysfs_emit()
  ALSA: ac97: Replace sprintf() with sysfs_emit()
  ALSA: hda/realtek: Add quirk for Clevo NV45PZ
  ALSA: hda/realtek: Add quirk for Lenovo Yoga9 14IAP7
  ALSA: control: Use deferred fasync helper
  ALSA: pcm: Use deferred fasync helper
  ALSA: timer: Use deferred fasync helper
  ALSA: core: Add async signal helpers
  ASoC: q6asm: use kcalloc() instead of kzalloc()
  ACPI: scan: Add CLSA0101 Laptop Support
  ALSA: hda: cs35l41: Support CLSA0101
  ALSA: hda: cs35l41: Use the CS35L41 HDA internal define
  ASoC: dt-bindings: use spi-peripheral-props.yaml
  ASoC: codecs: va-macro: use fsgen as clock
  ...

diff --cc Documentation/process/kernel-docs.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/gpu/drm/bridge/sii902x.c
Simple merge

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
Simple merge

diff --cc drivers/gpu/drm/sti/sti_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc drivers/media/i2c/tda1997x.c
Simple merge

diff --cc drivers/soundwire/intel.c
index 95ce292994ccb6f983917b3db9695e0cf3a961d3,fed6418d6375ec25af414bcd656a82a7cd333576..89d1d0d021fc72ab7a3724fc625fcb25bf0ec2bd
--- 1/drivers/soundwire/intel.c
--- 2/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@@ -1114,9 -1106,9 +1123,10 @@@ static const struct snd_soc_dai_ops int
  };
  
  static const struct snd_soc_component_driver dai_component = {
-       .name           = "soundwire",
-       .probe          = intel_component_probe,
-       .suspend        = intel_component_dais_suspend
+       .name                   = "soundwire",
++      .probe                  = intel_component_probe,
+       .suspend                = intel_component_dais_suspend,
+       .legacy_dai_naming      = 1,
  };
  
  static int intel_create_dai(struct sdw_cdns *cdns,

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/uapi/sound/sof/header.h
index dbf137516522113feae125c28c29ad9f4971376c,f125f7772ee7b5f73566d7de3dd37fcc2081662b..e9bba93a53990b4f32ad148ea8f51295fff3e3d5
--- 1/include/uapi/sound/sof/header.h
--- 2/include/uapi/sound/sof/header.h
+++ b/include/uapi/sound/sof/header.h
@@@ -23,7 -23,37 +23,37 @@@ struct sof_abi_hdr 
        __u32 size;             /**< size in bytes of data excl. this struct */
        __u32 abi;              /**< SOF ABI version */
        __u32 reserved[4];      /**< reserved for future use */
 -      __u32 data[0];          /**< Component data - opaque to core */
 +      __u32 data[];           /**< Component data - opaque to core */
  }  __packed;
  
+ #define SOF_MANIFEST_DATA_TYPE_NHLT 1
+ 
+ /**
+  * struct sof_manifest_tlv - SOF manifest TLV data
+  * @type: type of data
+  * @size: data size (not including the size of this struct)
+  * @data: payload data
+  */
+ struct sof_manifest_tlv {
+       __le32 type;
+       __le32 size;
+       __u8 data[];
+ };
+ 
+ /**
+  * struct sof_manifest - SOF topology manifest
+  * @abi_major: Major ABI version
+  * @abi_minor: Minor ABI version
+  * @abi_patch: ABI patch
+  * @count: count of tlv items
+  * @items: consecutive variable size tlv items
+  */
+ struct sof_manifest {
+       __le16 abi_major;
+       __le16 abi_minor;
+       __le16 abi_patch;
+       __le16 count;
+       struct sof_manifest_tlv items[];
+ };
+ 
  #endif

diff --cc sound/core/isadma.c
Simple merge

diff --cc sound/soc/bcm/cygnus-ssp.c
Simple merge