From b6d643fb3cbf88f2a24ea5ff0dec012c7c6939a6 Mon Sep 17 00:00:00 2001
From: Mark Hills <mark@xwax.org>
Date: Sun, 17 Mar 2013 11:07:53 +0000
Subject: [PATCH] --- yaml --- r: 371711 b: refs/heads/master c:
 5e212332cc7eed0ffbf91fbe5bab6e2a44b83de6 h: refs/heads/master i:   371709:
 53da69448813942e0b1864009892dcbf49fa290c   371707:
 0e0ba6176880cb53f49b5f9b45a69d7333caf4ff   371703:
 61a1ca6f328b7d66f0bd0dfb6367fb177899f6a1   371695:
 c56620ec02373a1f820b79a728696269fcbb51aa   371679:
 74502a2476fc0d24e048743907d7bc908277f1d7   371647:
 1f8c4dcd3fda918bf4147bf35938a1f8656295d5   371583:
 af447baa34a65b64881e5fe0a7d09fe60a6762c1   371455:
 829b62d7e0e0ebe0d8ccccddf47925b9bc581f52   371199:
 af97cc94528a5064a434df3a2aec5146e455cd7c   370687:
 14862cc8ab636811fffef06b954b6b45fdda3e79 v: v3

---
 [refs]                         |  2 +-
 trunk/sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++
 trunk/sound/usb/quirks.c       | 15 +++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0159f3bb1ed5..37cfa79d155f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba615b86d6a3ba6e244973672c63903c8b2831a3
+refs/heads/master: 5e212332cc7eed0ffbf91fbe5bab6e2a44b83de6
diff --git a/trunk/sound/usb/quirks-table.h b/trunk/sound/usb/quirks-table.h
index c39f898b15d2..a620c239caed 100644
--- a/trunk/sound/usb/quirks-table.h
+++ b/trunk/sound/usb/quirks-table.h
@@ -2747,6 +2747,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 		.type = QUIRK_MIDI_RAW_BYTES
 	}
 },
+{
+	USB_DEVICE(0x1235, 0x0018),
+	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+		.vendor_name = "Novation",
+		.product_name = "Twitch",
+		.ifnum = QUIRK_ANY_INTERFACE,
+		.type = QUIRK_COMPOSITE,
+		.data = (const struct snd_usb_audio_quirk[]) {
+			{
+				.ifnum = 0,
+				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+				.data = & (const struct audioformat) {
+					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+					.channels = 4,
+					.iface = 0,
+					.altsetting = 1,
+					.altset_idx = 1,
+					.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
+					.endpoint = 0x01,
+					.ep_attr = USB_ENDPOINT_XFER_ISOC,
+					.rates = SNDRV_PCM_RATE_44100 |
+						 SNDRV_PCM_RATE_48000,
+					.rate_min = 44100,
+					.rate_max = 48000,
+					.nr_rates = 2,
+					.rate_table = (unsigned int[]) {
+						44100, 48000
+					}
+				}
+			},
+			{
+				.ifnum = 1,
+				.type = QUIRK_MIDI_RAW_BYTES
+			},
+			{
+				.ifnum = -1
+			}
+		}
+	}
+},
 {
 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x4661),
 	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
diff --git a/trunk/sound/usb/quirks.c b/trunk/sound/usb/quirks.c
index 5325a3869bb7..7c4fe5a634f0 100644
--- a/trunk/sound/usb/quirks.c
+++ b/trunk/sound/usb/quirks.c
@@ -445,6 +445,17 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 	return err;
 }
 
+/*
+ * Novation Twitch DJ controller
+ */
+static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
+{
+	/* preemptively set up the device because otherwise the
+	 * raw MIDI endpoints are not active */
+	usb_set_interface(dev, 0, 1);
+	return 0;
+}
+
 /*
  * This call will put the synth in "USB send" mode, i.e it will send MIDI
  * messages through USB (this is disabled at startup). The synth will
@@ -746,6 +757,10 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
 		/* Digidesign Mbox 2 */
 		return snd_usb_mbox2_boot_quirk(dev);
 
+	case USB_ID(0x1235, 0x0018):
+		/* Focusrite Novation Twitch */
+		return snd_usb_twitch_boot_quirk(dev);
+
 	case USB_ID(0x133e, 0x0815):
 		/* Access Music VirusTI Desktop */
 		return snd_usb_accessmusic_boot_quirk(dev);