From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Apr 2020 22:50:04 +0000 (-0700)
Subject: Merge tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... 
X-Git-Tag: v5.15~4170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=848960e576dafc8ed54c691b2f70b92e1fdea9ba;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'sound-5.7-rc1' of git://git./linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This became again a busy development cycle.  There are few ALSA core
  updates (merely API cleanups and sparse fixes), with the majority of
  other changes are found in ASoC scene.

  Here are some highlights:

  ALSA core:
   - More helper macros for sparse warning fixes (e.g. bitwise types)
   - Slight optimization of PCM OSS locks
   - Make common handling for PCM / compress buffers (for SOF)

  ASoC:
   - Lots of code refactoring and modernization for (still ongoing)
     componentization works
   - Conversion of SND_SOC_ALL_CODECS to use imply
   - Continued refactoring and fixing of the Intel SOF/SST support,
     including the initial (but still incomplete) SoundWire support
   - SoundWire and more advanced clocking support for Realtek RT5682
   - Support for amlogic GX, Meson 8, Meson 8B and T9015 DAC, Broadcom
     DSL/PON, Ingenic JZ4760 and JZ4770, Realtek RL6231, and TI TAS2563
     and TLV320ADCX140

  HD-audio:
   - Optimizations in HDMI jack handling
   - A few new quirks and fixups for Realtek codecs

  USB-audio:
   - Delayed registration support
   - New quirks for Motu, Kingston, Presonus"

* tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (415 commits)
  ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor
  Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
  ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups
  ALSA: hda/realtek - Set principled PC Beep configuration for ALC256
  ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256
  ALSA: hda/realtek - a fake key event is triggered by running shutup
  ALSA: hda: default enable CA0132 DSP support
  ASoC: amd: acp3x-pcm-dma: clean up two indentation issues
  ASoC: tlv320adcx140: Remove undocumented property
  ASoC: Intel: sof_sdw: Add Volteer support with RT5682 SNDW helper function
  ASoC: Intel: common: add match table for TGL RT5682 SoundWire driver
  ASoC: Intel: boards: add sof_sdw machine driver
  ASoC: Intel: soc-acpi: update topology and driver name for SoundWire platforms
  ASoC: rt5682: move DAI clock registry to I2S mode
  ASoC: pxa: magician: convert to use i2c_new_client_device()
  ASoC: SOF: Intel: hda-ctrl: add reset cycle before parsing capabilities
  Asoc: SOF: Intel: hda: check SoundWire wakeen interrupt in irq thread
  ASoC: SOF: Intel: hda: add WAKEEN interrupt support for SoundWire
  ASoC: SOF: Intel: hda: add parameter to control SoundWire clock stop quirks
  ASoC: SOF: Intel: hda: merge IPC, stream and SoundWire interrupt handlers
  ...
---

848960e576dafc8ed54c691b2f70b92e1fdea9ba
diff --cc include/linux/usb/audio-v2.h
index 5e31740,cb9900b..ead8c9a
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@@ -153,9 -153,21 +153,21 @@@ struct uac2_feature_unit_descriptor 
  	__u8 bSourceID;
  	/* bmaControls is actually u32,
  	 * but u8 is needed for the hybrid parser */
 -	__u8 bmaControls[0]; /* variable length */
 +	__u8 bmaControls[]; /* variable length */
  } __attribute__((packed));
  
+ /* 4.7.2.10 Effect Unit Descriptor */
+ 
+ struct uac2_effect_unit_descriptor {
+ 	__u8 bLength;
+ 	__u8 bDescriptorType;
+ 	__u8 bDescriptorSubtype;
+ 	__u8 bUnitID;
+ 	__le16 wEffectType;
+ 	__u8 bSourceID;
+ 	__u8 bmaControls[]; /* variable length */
+ } __attribute__((packed));
+ 
  /* 4.9.2 Class-Specific AS Interface Descriptor */
  
  struct uac2_as_header_descriptor {