1 files changed, 72 insertions, 8 deletions

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 9ea726c049c6..69689e79bf79 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -62,6 +62,13 @@
         .idProduct = 0x3f04,
         .bInterfaceClass = USB_CLASS_AUDIO,
 },
+{
+        /* E-Mu Tracker Pre */
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f0a,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
 
 /*
  * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface
@@ -855,15 +862,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .data = (const struct snd_usb_audio_quirk[]) {
                         {
                                 .ifnum = 1,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = 2,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = 3,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = -1
@@ -1197,15 +1204,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .data = (const struct snd_usb_audio_quirk[]) {
                         {
                                 .ifnum = 0,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = 1,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = 2,
-                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
                         },
                         {
                                 .ifnum = -1
@@ -1338,6 +1345,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+{
+        /*
+         * This quirk is for the "Advanced Driver" mode. If off, the UA-4FX
+         * is standard compliant, but has only 16-bit PCM and no MIDI.
+         */
+        USB_DEVICE(0x0582, 0x00a3),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "EDIROL",
+                .product_name = "UA-4FX",
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
         /* TODO: add Edirol MD-P1 support */
 {
         USB_DEVICE(0x582, 0x00a6),
@@ -1383,7 +1420,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
-
 {
         /* Roland SonicCell */
         USB_DEVICE(0x0582, 0x00c2),
@@ -1415,7 +1451,35 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
-
+{
+        /* BOSS GT-10 */
+        USB_DEVICE(0x0582, 0x00da),
+        .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_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const struct snd_usb_midi_endpoint_info) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 
 /* Guillemot devices */
 {