diff options
| author | Linus Torvalds <[email protected]> | 2021-02-21 14:21:35 -0800 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-02-21 14:21:35 -0800 | 
| commit | 10e2ec8edece2566b40f69bae035a555ece71ab4 (patch) | |
| tree | 27eed009a4817948623bbc31a83911c5ace7a4b0 /sound/usb/quirks-table.h | |
| parent | de1617578849acab8e16c9ffdce39b91fb50639d (diff) | |
| parent | c4294d7f057d05053412ebd0d5700228d0f2588d (diff) | |
Merge tag 'sound-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
 "A relatively calm release at this time, and no massive code changes
  are found in the stats, while a wide range of code refactoring and
  cleanup have been done.
  Note that this update includes the tree-wide trivial changes for
  dropping the return value from ISA remove callbacks, too.
  Below lists up some highlight:
  ALSA Core:
   - Support for the software jack injection via debugfs
   - Fixes for sync_stop PCM operations
  HD-audio and USB-audio:
   - A few usual HD-audio device quirks
   - Updates for Tegra HD-audio
   - More quirks for Pioneer and other USB-audio devices
   - Stricter state checks at USB-audio disconnection
  ASoC:
   - Continued code refactoring, cleanup and fixes in ASoC core API
   - A KUnit testsuite for the topology code
   - Lots of ASoC Intel driver Realtek codec updates, quirk additions
     and fixes
   - Support for Ingenic JZ4760(B), Intel AlderLake-P, DT configured
     nVidia cards, Qualcomm lpass-rx-macro and lpass-tx-macro
   - Removal of obsolete SIRF prima/atlas, Txx9 and ZTE zx drivers
  Others:
   - Drop return value from ISA driver remove callback
   - Cleanup with DIV_ROUND_UP() macro
   - FireWire updates, HDSP output loopback support"
* tag 'sound-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (322 commits)
  ALSA: hda: intel-dsp-config: add Alder Lake support
  ASoC: soc-pcm: fix hw param limits calculation for multi-DAI
  ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet
  ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet
  ASoC: soc-pcm: fix hwparams min/max init for dpcm
  ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup
  ALSA: usb-audio: Add implicit fb quirk for BOSS GP-10
  ALSA: hda: Add another CometLake-H PCI ID
  ASoC: soc-pcm: add soc_pcm_hw_update_format()
  ASoC: soc-pcm: add soc_pcm_hw_update_chan()
  ASoC: soc-pcm: add soc_pcm_hw_update_rate()
  ASoC: wm_adsp: Remove unused control callback structure
  ASoC: SOF: relax ABI checks and avoid unnecessary warnings
  ASoC: codecs: lpass-tx-macro: add dapm widgets and route
  ASoC: codecs: lpass-tx-macro: add support for lpass tx macro
  ASoC: qcom: dt-bindings: add bindings for lpass tx macro codec
  ASoC: codecs: lpass-rx-macro: add iir widgets
  ASoC: codecs: lpass-rx-macro: add dapm widgets and route
  ...
Diffstat (limited to 'sound/usb/quirks-table.h')
| -rw-r--r-- | sound/usb/quirks-table.h | 117 | 
1 files changed, 117 insertions, 0 deletions
| diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index c8a4bdf18207..1165a5ac60f2 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3757,6 +3757,123 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),  		}  	}  }, +{ +	/* +	 * Pioneer DJ DJM-750 +	 * 8 channels playback & 8 channels capture @ 44.1/48/96kHz S24LE +	 */ +	USB_DEVICE_VENDOR_SPEC(0x08e4, 0x017f), +	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { +		.ifnum = QUIRK_ANY_INTERFACE, +		.type = QUIRK_COMPOSITE, +		.data = (const struct snd_usb_audio_quirk[]) { +			{ +				.ifnum = 0, +				.type = QUIRK_AUDIO_FIXED_ENDPOINT, +				.data = &(const struct audioformat) { +					.formats = SNDRV_PCM_FMTBIT_S24_3LE, +					.channels = 8, +					.iface = 0, +					.altsetting = 1, +					.altset_idx = 1, +					.endpoint = 0x05, +					.ep_attr = USB_ENDPOINT_XFER_ISOC| +					    USB_ENDPOINT_SYNC_ASYNC, +					.rates = SNDRV_PCM_RATE_44100| +						SNDRV_PCM_RATE_48000| +						SNDRV_PCM_RATE_96000, +					.rate_min = 44100, +					.rate_max = 96000, +					.nr_rates = 3, +					.rate_table = (unsigned int[]) { 44100, 48000, 96000 } +				} +			}, +			{ +				.ifnum = 0, +				.type = QUIRK_AUDIO_FIXED_ENDPOINT, +				.data = &(const struct audioformat) { +					.formats = SNDRV_PCM_FMTBIT_S24_3LE, +					.channels = 8, +					.iface = 0, +					.altsetting = 1, +					.altset_idx = 1, +					.endpoint = 0x86, +					.ep_idx = 1, +					.ep_attr = USB_ENDPOINT_XFER_ISOC| +						USB_ENDPOINT_SYNC_ASYNC| +						USB_ENDPOINT_USAGE_IMPLICIT_FB, +					.rates = SNDRV_PCM_RATE_44100| +						SNDRV_PCM_RATE_48000| +						SNDRV_PCM_RATE_96000, +					.rate_min = 44100, +					.rate_max = 96000, +					.nr_rates = 3, +					.rate_table = (unsigned int[]) { 44100, 48000, 96000 } +				} +			}, +			{ +				.ifnum = -1 +			} +		} +	} +}, +{ +	/* +	 * Pioneer DJ DJM-450 +	 * PCM is 8 channels out @ 48 fixed (endpoint 0x01) +	 * and 8 channels in @ 48 fixed (endpoint 0x82). +	 */ +	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0013), +	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { +		.ifnum = QUIRK_ANY_INTERFACE, +		.type = QUIRK_COMPOSITE, +		.data = (const struct snd_usb_audio_quirk[]) { +			{ +				.ifnum = 0, +				.type = QUIRK_AUDIO_FIXED_ENDPOINT, +				.data = &(const struct audioformat) { +					.formats = SNDRV_PCM_FMTBIT_S24_3LE, +					.channels = 8, // outputs +					.iface = 0, +					.altsetting = 1, +					.altset_idx = 1, +					.endpoint = 0x01, +					.ep_attr = USB_ENDPOINT_XFER_ISOC| +						USB_ENDPOINT_SYNC_ASYNC, +					.rates = SNDRV_PCM_RATE_48000, +					.rate_min = 48000, +					.rate_max = 48000, +					.nr_rates = 1, +					.rate_table = (unsigned int[]) { 48000 } +					} +			}, +			{ +				.ifnum = 0, +				.type = QUIRK_AUDIO_FIXED_ENDPOINT, +				.data = &(const struct audioformat) { +					.formats = SNDRV_PCM_FMTBIT_S24_3LE, +					.channels = 8, // inputs +					.iface = 0, +					.altsetting = 1, +					.altset_idx = 1, +					.endpoint = 0x82, +					.ep_idx = 1, +					.ep_attr = USB_ENDPOINT_XFER_ISOC| +						USB_ENDPOINT_SYNC_ASYNC| +						USB_ENDPOINT_USAGE_IMPLICIT_FB, +					.rates = SNDRV_PCM_RATE_48000, +					.rate_min = 48000, +					.rate_max = 48000, +					.nr_rates = 1, +					.rate_table = (unsigned int[]) { 48000 } +				} +			}, +			{ +				.ifnum = -1 +			} +		} +	} +},  #undef USB_DEVICE_VENDOR_SPEC  #undef USB_AUDIO_DEVICE |