Commit 470757f5 authored by Alexander Tsoy's avatar Alexander Tsoy Committed by Takashi Iwai

ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)

Capture and playback endpoints on Saffire 6 (USB 1.1) resides on the same
interface. This was not supported by the composite quirk back in the day
when initial support for this device was added, thus only playback was
enabled until now.

Fixes: 11e424e8 ("ALSA: usb-audio: Add support for Focusrite Saffire 6 USB")
Signed-off-by: default avatarAlexander Tsoy <alexander@tsoy.me>
Cc: <stable.vger.kernel.org>
Link: https://lore.kernel.org/r/20200815002103.29247-1-alexander@tsoy.meSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f70fff83
...@@ -2678,6 +2678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -2678,6 +2678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.ifnum = QUIRK_ANY_INTERFACE, .ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE, .type = QUIRK_COMPOSITE,
.data = (const struct snd_usb_audio_quirk[]) { .data = (const struct snd_usb_audio_quirk[]) {
{
.ifnum = 0,
.type = QUIRK_AUDIO_STANDARD_MIXER,
},
{ {
.ifnum = 0, .ifnum = 0,
.type = QUIRK_AUDIO_FIXED_ENDPOINT, .type = QUIRK_AUDIO_FIXED_ENDPOINT,
...@@ -2690,6 +2694,32 @@ YAMAHA_DEVICE(0x7010, "UB99"), ...@@ -2690,6 +2694,32 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE, .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
.endpoint = 0x01, .endpoint = 0x01,
.ep_attr = USB_ENDPOINT_XFER_ISOC, .ep_attr = USB_ENDPOINT_XFER_ISOC,
.datainterval = 1,
.maxpacksize = 0x024c,
.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 = 0,
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
.data = &(const struct audioformat) {
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
.channels = 2,
.iface = 0,
.altsetting = 1,
.altset_idx = 1,
.attributes = 0,
.endpoint = 0x82,
.ep_attr = USB_ENDPOINT_XFER_ISOC,
.datainterval = 1,
.maxpacksize = 0x0126,
.rates = SNDRV_PCM_RATE_44100 | .rates = SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000, SNDRV_PCM_RATE_48000,
.rate_min = 44100, .rate_min = 44100,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment