Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[powerpc.git] / sound / usb / usbquirks.h

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index f74e652..ba506c3 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -117,6 +117,10 @@ YAMAHA_DEVICE(0x103a, NULL),
 YAMAHA_DEVICE(0x103b, NULL),
 YAMAHA_DEVICE(0x103c, NULL),
 YAMAHA_DEVICE(0x103d, NULL),
+YAMAHA_DEVICE(0x103e, NULL),
+YAMAHA_DEVICE(0x103f, NULL),
+YAMAHA_DEVICE(0x1040, NULL),
+YAMAHA_DEVICE(0x1041, NULL),
 YAMAHA_DEVICE(0x2000, "DGP-7"),
 YAMAHA_DEVICE(0x2001, "DGP-5"),
 YAMAHA_DEVICE(0x2002, NULL),
@@ -290,6 +294,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* a later revision uses ID 0x0099 */
        USB_DEVICE(0x0582, 0x0005),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -380,6 +385,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* a later revision uses ID 0x009d */
        USB_DEVICE(0x0582, 0x0009),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -528,6 +534,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0013 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0012),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -541,6 +548,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0015 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0014),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -554,6 +562,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0017 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0016),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -584,6 +593,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x001c when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x001b),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -614,6 +624,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x001e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x001d),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -627,6 +638,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0024 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0023),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -671,6 +683,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0028 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0027),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -684,6 +697,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x002a when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0029),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -728,6 +742,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x002e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x002d),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -741,6 +756,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0030 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x002f),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -754,6 +770,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0034 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0033),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -766,7 +783,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
+       /* TODO: add Roland M-1000 support */
 {
+       /*
+        * Has ID 0x0038 when not in "Advanced Driver" mode;
+        * later revisions use IDs 0x0054 and 0x00a2.
+        */
        USB_DEVICE(0x0582, 0x0037),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -811,6 +833,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0041 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0040),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -824,6 +847,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0043 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0042),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -867,6 +891,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x004a when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0048),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -879,7 +904,9 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
+       /* TODO: add Edirol M-100FX support */
 {
+       /* has ID 0x004f when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x004d),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -927,7 +954,9 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                .type = QUIRK_MIDI_STANDARD_INTERFACE
        }
 },
+       /* TODO: add Roland EXR support */
 {
+       /* has ID 0x0067 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0065),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "EDIROL",
@@ -941,6 +970,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x006b when not in "Advanced Driver" mode */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x006a),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -954,6 +984,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x006e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x006d),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "Roland",
@@ -998,6 +1029,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
+       /* has ID 0x0076 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0075),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                .vendor_name = "BOSS",
@@ -1010,6 +1042,50 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                }
        }
 },
+{
+       /* has ID 0x007b when not in "Advanced Driver" mode */
+       USB_DEVICE_VENDOR_SPEC(0x0582, 0x007a),
+       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+               .vendor_name = "Roland",
+               /* "RD" or "RD-700SX"? */
+               .ifnum = 0,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const snd_usb_midi_endpoint_info_t) {
+                       .out_cables = 0x0003,
+                       .in_cables  = 0x0003
+               }
+       }
+},
+
+/* Guillemot devices */
+{
+       /*
+        * This is for the "Windows Edition" where the external MIDI ports are
+        * the only MIDI ports; the control data is reported through HID
+        * interfaces.  The "Macintosh Edition" has ID 0xd002 and uses standard
+        * compliant USB MIDI ports for external MIDI and controls.
+        */
+       USB_DEVICE_VENDOR_SPEC(0x06f8, 0xb000),
+       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+               .vendor_name = "Hercules",
+               .product_name = "DJ Console (WE)",
+               .ifnum = 4,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const snd_usb_midi_endpoint_info_t) {
+                       .out_cables = 0x0001,
+                       .in_cables = 0x0001
+               }
+       }
+},
+       /* TODO: add Edirol UA-101 support */
+       /* TODO: add Roland G-70 support */
+       /* TODO: add Roland V-SYNTH XT support */
+       /* TODO: add BOSS GT-PRO support */
+       /* TODO: add Edirol PC-50 support */
+       /* TODO: add Edirol PC-80 support */
+       /* TODO: add Edirol UA-1EX support */
+       /* TODO: add Edirol UM-3 support */
+       /* TODO: add Edirol MD-P1 support */
 
 /* Midiman/M-Audio devices */
 {
@@ -1339,10 +1415,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+/* TerraTec devices */
+{
+       USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
+       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+               .vendor_name = "TerraTec",
+               .product_name = "PHASE 26",
+               .ifnum = 3,
+               .type = QUIRK_MIDI_STANDARD_INTERFACE
+       }
+},
 {
        USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0013),
        .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
-               .vendor_name = "Terratec",
+               .vendor_name = "TerraTec",
                .product_name = "PHASE 26",
                .ifnum = 3,
                .type = QUIRK_MIDI_STANDARD_INTERFACE