summaryrefslogtreecommitdiffstats
path: root/sound/usb/quirks.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-10 19:31:55 +0200
committerMark Brown <broonie@kernel.org>2015-06-10 19:31:55 +0200
commit5ae4f63b5062bc4e329940cc5cecdf0856b85849 (patch)
tree63f389874f6d330f84a9d36abec2c127bd71066e /sound/usb/quirks.c
parentASoC: rt5645: add device tree support (diff)
parentMerge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and '... (diff)
downloadlinux-5ae4f63b5062bc4e329940cc5cecdf0856b85849.tar.xz
linux-5ae4f63b5062bc4e329940cc5cecdf0856b85849.zip
Merge tag 'asoc-v4.2' into asoc-rt5645
ASoC: Updates for v4.2 The big thing this release has been Liam's addition of topology support to the core. We've also seen quite a bit of driver work and the continuation of Lars' refactoring for component support. - Support for loading ASoC topology maps from firmware, intended to be used to allow self-describing DSP firmware images to be built which can map controls added by the DSP to userspace without the kernel needing to know about individual DSP firmwares. - Lots of refactoring to avoid direct access to snd_soc_codec where it's not needed supporting future refactoring. - Big refactoring and cleanup serieses for the Wolfson ADSP and TI TAS2552 drivers. - Support for TI TAS571x power amplifiers. - Support for Qualcomm APQ8016 and ZTE ZX296702 SoCs. - Support for x86 systems with RT5650 and Qualcomm Storm.
Diffstat (limited to 'sound/usb/quirks.c')
-rw-r--r--sound/usb/quirks.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 7c5a70139278..29175346cc4f 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1117,6 +1117,8 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
switch (chip->usb_id) {
case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema */
case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
+ case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */
+ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
return true;
}