Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 69 insertions, 16 deletions

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 9a9da09586a5..090e1930dfdc 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -19,6 +19,7 @@
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 
+#include <sound/control.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/pcm.h>
@@ -263,10 +264,24 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
 }
 
 /*
+ * Create a standard mixer for the specified interface.
+ */
+static int create_standard_mixer_quirk(struct snd_usb_audio *chip,
+                                       struct usb_interface *iface,
+                                       struct usb_driver *driver,
+                                       const struct snd_usb_audio_quirk *quirk)
+{
+        if (quirk->ifnum < 0)
+                return 0;
+
+        return snd_usb_create_mixer(chip, quirk->ifnum, 0);
+}
+
+/*
  * audio-interface quirks
  *
  * returns zero if no standard audio/MIDI parsing is needed.
- * returns a postive value if standard audio/midi interfaces are parsed
+ * returns a positive value if standard audio/midi interfaces are parsed
  * after this.
  * returns a negative value at error.
  */
@@ -287,14 +302,15 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
                 [QUIRK_MIDI_YAMAHA] = create_any_midi_quirk,
                 [QUIRK_MIDI_MIDIMAN] = create_any_midi_quirk,
                 [QUIRK_MIDI_NOVATION] = create_any_midi_quirk,
-                [QUIRK_MIDI_FASTLANE] = create_any_midi_quirk,
+                [QUIRK_MIDI_RAW_BYTES] = create_any_midi_quirk,
                 [QUIRK_MIDI_EMAGIC] = create_any_midi_quirk,
                 [QUIRK_MIDI_CME] = create_any_midi_quirk,
                 [QUIRK_MIDI_AKAI] = create_any_midi_quirk,
                 [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
                 [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
                 [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,
-                [QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk
+                [QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk,
+                [QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk,
         };
 
         if (quirk->type < QUIRK_TYPE_COUNT) {
@@ -387,7 +403,7 @@ static int snd_usb_cm106_boot_quirk(struct usb_device *dev)
 static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 {
         int err, reg;
-        int val[] = {0x200c, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000};
+        int val[] = {0x2004, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000};
 
         for (reg = 0; reg < ARRAY_SIZE(val); reg++) {
                 err = snd_usb_cm106_write_int_reg(dev, reg, val[reg]);
@@ -425,6 +441,34 @@ static int snd_usb_accessmusic_boot_quirk(struct usb_device *dev)
 }
 
 /*
+ * Some sound cards from Native Instruments are in fact compliant to the USB
+ * audio standard of version 2 and other approved USB standards, even though
+ * they come up as vendor-specific device when first connected.
+ *
+ * However, they can be told to come up with a new set of descriptors
+ * upon their next enumeration, and the interfaces announced by the new
+ * descriptors will then be handled by the kernel's class drivers. As the
+ * product ID will also change, no further checks are required.
+ */
+
+static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
+{
+        int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                                  0xaf, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                  cpu_to_le16(1), 0, NULL, 0, 1000);
+
+        if (ret < 0)
+                return ret;
+
+        usb_reset_device(dev);
+
+        /* return -EAGAIN, so the creation of an audio interface for this
+         * temporary device is aborted. The device will reconnect with a
+         * new product ID */
+        return -EAGAIN;
+}
+
+/*
  * Setup quirks
  */
 #define AUDIOPHILE_SET                  0x01 /* if set, parse device_setup */
@@ -489,27 +533,35 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
         u32 id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
                         le16_to_cpu(dev->descriptor.idProduct));
 
-        /* SB Extigy needs special boot-up sequence */
-        /* if more models come, this will go to the quirk list. */
-        if (id == USB_ID(0x041e, 0x3000))
+        switch (id) {
+        case USB_ID(0x041e, 0x3000):
+                /* SB Extigy needs special boot-up sequence */
+                /* if more models come, this will go to the quirk list. */
                 return snd_usb_extigy_boot_quirk(dev, intf);
 
-        /* SB Audigy 2 NX needs its own boot-up magic, too */
-        if (id == USB_ID(0x041e, 0x3020))
+        case USB_ID(0x041e, 0x3020):
+                /* SB Audigy 2 NX needs its own boot-up magic, too */
                 return snd_usb_audigy2nx_boot_quirk(dev);
 
-        /* C-Media CM106 / Turtle Beach Audio Advantage Roadie */
-        if (id == USB_ID(0x10f5, 0x0200))
+        case USB_ID(0x10f5, 0x0200):
+                /* C-Media CM106 / Turtle Beach Audio Advantage Roadie */
                 return snd_usb_cm106_boot_quirk(dev);
 
-        /* C-Media CM6206 / CM106-Like Sound Device */
-        if (id == USB_ID(0x0d8c, 0x0102))
+        case USB_ID(0x0d8c, 0x0102):
+                /* C-Media CM6206 / CM106-Like Sound Device */
+        case USB_ID(0x0ccd, 0x00b1): /* Terratec Aureon 7.1 USB */
                 return snd_usb_cm6206_boot_quirk(dev);
 
-        /* Access Music VirusTI Desktop */
-        if (id == USB_ID(0x133e, 0x0815))
+        case USB_ID(0x133e, 0x0815):
+                /* Access Music VirusTI Desktop */
                 return snd_usb_accessmusic_boot_quirk(dev);
 
+        case USB_ID(0x17cc, 0x1000): /* Komplete Audio 6 */
+        case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */
+        case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */
+                return snd_usb_nativeinstruments_boot_quirk(dev);
+        }
+
         return 0;
 }
 
@@ -532,7 +584,7 @@ int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat
 }
 
 /*
- * For E-Mu 0404USB/0202USB/TrackerPre sample rate should be set for device,
+ * For E-Mu 0404USB/0202USB/TrackerPre/0204 sample rate should be set for device,
  * not for interface.
  */
 
@@ -589,6 +641,7 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
         case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */
         case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
         case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
+        case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */
                 set_format_emu_quirk(subs, fmt);
                 break;
         }