ALSA: usb-audio: Add support for Focusrite Saffire 6 USB (11e424e8) · Commits · 戴 / test

sound/usb/quirks-table.h

+40 −0

Original line number	Diff line number	Diff line
		@@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
		.type = QUIRK_MIDI_NOVATION
		}
		},
		{
		USB_DEVICE(0x1235, 0x0010),
		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
		.vendor_name = "Focusrite",
		.product_name = "Saffire 6 USB",
		.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
		}
		}
		}
		},

		/* Access Music devices */
		{

+5 −4

Original line number	Diff line number	Diff line
		@@ -674,8 +674,9 @@ static int snd_usb_gamecon780_boot_quirk(struct usb_device *dev)

		/*
		* Novation Twitch DJ controller
		* Focusrite Novation Saffire 6 USB audio card
		*/
		static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
		static int snd_usb_novation_boot_quirk(struct usb_device *dev)
		{
		/* preemptively set up the device because otherwise the
		* raw MIDI endpoints are not active */
		@@ -984,9 +985,9 @@ 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(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
		case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
		return snd_usb_novation_boot_quirk(dev);

		case USB_ID(0x133e, 0x0815):
		/* Access Music VirusTI Desktop */