diff options
| author | Linus Torvalds <[email protected]> | 2020-08-06 14:27:31 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-08-06 14:27:31 -0700 | 
| commit | 3f9df56480fc8ce492fc9e988d67bdea884ed15c (patch) | |
| tree | 6e1c5ed1e28b72435995b8bcd191daa7dfdf770e /sound/usb/quirks.c | |
| parent | 921d2597abfc05e303f08baa6ead8f9ab8a723e1 (diff) | |
| parent | c7fabbc51352f50cc58242a6dc3b9c1a3599849b (diff) | |
Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
 "This became wide and scattered updates all over the sound tree as
  diffstat shows: lots of (still ongoing) refactoring works in ASoC,
  fixes and cleanups caught by static analysis, inclusive term
  conversions as well as lots of new drivers. Below are highlights:
  ASoC core:
   - API cleanups and conversions to the unified mute_stream() call
   - Simplify I/O helper functions
   - Use helper macros to retrieve RTD from substreams
  ASoC drivers:
   - Lots of fixes and cleanups in Intel ASoC drivers
   - Lots of new stuff: Freescale MQS and i.MX6sx, Intel KeemBay I2S,
     Maxim MAX98360A and MAX98373 SoundWire, various Mediatek boards,
     nVidia Tegra 186 and 210, RealTek RL6231, Samsung Midas and Aries
     boards, TI J721e EVM
  ALSA core:
   - Minor code refacotring for SG-buffer handling
  HD-audio:
   - Generalization of mute-LED handling with LED classdev
   - Intel silent stream support for HDMI
   - Device-specific fixes: CA0132, Loongson-3
  Others:
   - Usual USB- and HD-audio quirks for various devices
   - Fixes for echoaudio DMA position handling
   - Various documents and trivial fixes for sparse warnings
   - Conversion to adopt inclusive terms"
* tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (479 commits)
  ALSA: pci: delete repeated words in comments
  ALSA: isa: delete repeated words in comments
  ALSA: hda/tegra: Add 100us dma stop delay
  ALSA: hda: Add dma stop delay variable
  ASoC: hda/tegra: Set buffer alignment to 128 bytes
  ALSA: seq: oss: Serialize ioctls
  ALSA: hda/hdmi: Add quirk to force connectivity
  ALSA: usb-audio: add startech usb audio dock name
  ALSA: usb-audio: Add support for Lenovo ThinkStation P620
  Revert "ALSA: hda: call runtime_allow() for all hda controllers"
  ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.
  ALSA: hda/ca0132 - Add new quirk ID for Recon3D.
  ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
  ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops
  ALSA: docs: fix typo
  ALSA: doc: use correct config variable name
  ASoC: core: Two step component registration
  ASoC: core: Simplify snd_soc_component_initialize declaration
  ASoC: core: Relocate and expose snd_soc_component_initialize
  ASoC: sh: Replace 'select' DMADEVICES 'with depends on'
  ...
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index fca72730a802..c551141f337e 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1144,14 +1144,14 @@ static int snd_usb_motu_m_series_boot_quirk(struct usb_device *dev)  #define MAUDIO_SET		0x01 /* parse device_setup */  #define MAUDIO_SET_COMPATIBLE	0x80 /* use only "win-compatible" interfaces */  #define MAUDIO_SET_DTS		0x02 /* enable DTS Digital Output */ -#define MAUDIO_SET_96K		0x04 /* 48-96KHz rate if set, 8-48KHz otherwise */ +#define MAUDIO_SET_96K		0x04 /* 48-96kHz rate if set, 8-48kHz otherwise */  #define MAUDIO_SET_24B		0x08 /* 24bits sample if set, 16bits otherwise */  #define MAUDIO_SET_DI		0x10 /* enable Digital Input */  #define MAUDIO_SET_MASK		0x1f /* bit mask for setup value */ -#define MAUDIO_SET_24B_48K_DI	 0x19 /* 24bits+48KHz+Digital Input */ -#define MAUDIO_SET_24B_48K_NOTDI 0x09 /* 24bits+48KHz+No Digital Input */ -#define MAUDIO_SET_16B_48K_DI	 0x11 /* 16bits+48KHz+Digital Input */ -#define MAUDIO_SET_16B_48K_NOTDI 0x01 /* 16bits+48KHz+No Digital Input */ +#define MAUDIO_SET_24B_48K_DI	 0x19 /* 24bits+48kHz+Digital Input */ +#define MAUDIO_SET_24B_48K_NOTDI 0x09 /* 24bits+48kHz+No Digital Input */ +#define MAUDIO_SET_16B_48K_DI	 0x11 /* 16bits+48kHz+Digital Input */ +#define MAUDIO_SET_16B_48K_NOTDI 0x01 /* 16bits+48kHz+No Digital Input */  static int quattro_skip_setting_quirk(struct snd_usb_audio *chip,  				      int iface, int altno) @@ -1597,7 +1597,7 @@ void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep)  	/*  	 * M-Audio Fast Track C400/C600 - when packets are not skipped, real -	 * world latency varies by approx. +/- 50 frames (at 96KHz) each time +	 * world latency varies by approx. +/- 50 frames (at 96kHz) each time  	 * the stream is (re)started. When skipping packets 16 at endpoint  	 * start up, the real world latency is stable within +/- 1 frame (also  	 * across power cycles). @@ -1839,7 +1839,7 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,  		/*  		 * MaxPacketsOnly attribute is erroneously set in endpoint  		 * descriptors. As a result this card produces noise with -		 * all sample rates other than 96 KHz. +		 * all sample rates other than 96 kHz.  		 */  		fp->attributes &= ~UAC_EP_CS_ATTR_FILL_MAX;  		break; |