aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/quirks-table.h
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2011-02-11 11:08:06 +0000
committerTakashi Iwai <tiwai@suse.de>2011-02-14 17:10:57 +0100
commit54a8c500d5b80c83e0f14cbcfcfd4a84abff8a80 (patch)
tree2292d77a630dec193a5682e6238d73b7c09a8cd9 /sound/usb/quirks-table.h
parentdf8d81a32fa0309d64726fc62d83cb70adc899e8 (diff)
downloadkernel_samsung_aries-54a8c500d5b80c83e0f14cbcfcfd4a84abff8a80.zip
kernel_samsung_aries-54a8c500d5b80c83e0f14cbcfcfd4a84abff8a80.tar.gz
kernel_samsung_aries-54a8c500d5b80c83e0f14cbcfcfd4a84abff8a80.tar.bz2
ALSA: usb-audio: add support for Native Instruments MK2 devices
The MK2 generation of Native Instruments' sound cards are in fact compliant to the USB audio standard of version 2 and other approved USB standards. However, they come up as vendor-specific device when first connected but can be told to come up with a new set of descriptors upon their next enumeration. The interfaces announced by the new descriptors will be handled by the kernel's class drivers. This is done by issuing a vendor specific device request and sending the device to reset. There are also some vendor-specific USB requests for some mixer elements that can't be exported in a standard compliant way. The driver now supports them with quirks handling mechanisms. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/quirks-table.h')
-rw-r--r--sound/usb/quirks-table.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 3599987..e1e245d 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2283,6 +2283,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
}
},
+/* Native Instruments MK2 series */
+{
+ /* Traktor Audio 6 */
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x17cc,
+ .idProduct = 0x1010,
+},
+{
+ /* Traktor Audio 10 */
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x17cc,
+ .idProduct = 0x1020,
+},
+
/* Miditech devices */
{
USB_DEVICE(0x4752, 0x0011),