Skip to content

Commit 470757f

Browse files
puleglottiwai
authored andcommitted
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: 11e424e ("ALSA: usb-audio: Add support for Focusrite Saffire 6 USB") Signed-off-by: Alexander Tsoy <[email protected]> Cc: <stable.vger.kernel.org> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent f70fff8 commit 470757f

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

sound/usb/quirks-table.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,6 +2678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
26782678
.ifnum = QUIRK_ANY_INTERFACE,
26792679
.type = QUIRK_COMPOSITE,
26802680
.data = (const struct snd_usb_audio_quirk[]) {
2681+
{
2682+
.ifnum = 0,
2683+
.type = QUIRK_AUDIO_STANDARD_MIXER,
2684+
},
26812685
{
26822686
.ifnum = 0,
26832687
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
@@ -2690,6 +2694,32 @@ YAMAHA_DEVICE(0x7010, "UB99"),
26902694
.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
26912695
.endpoint = 0x01,
26922696
.ep_attr = USB_ENDPOINT_XFER_ISOC,
2697+
.datainterval = 1,
2698+
.maxpacksize = 0x024c,
2699+
.rates = SNDRV_PCM_RATE_44100 |
2700+
SNDRV_PCM_RATE_48000,
2701+
.rate_min = 44100,
2702+
.rate_max = 48000,
2703+
.nr_rates = 2,
2704+
.rate_table = (unsigned int[]) {
2705+
44100, 48000
2706+
}
2707+
}
2708+
},
2709+
{
2710+
.ifnum = 0,
2711+
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
2712+
.data = &(const struct audioformat) {
2713+
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
2714+
.channels = 2,
2715+
.iface = 0,
2716+
.altsetting = 1,
2717+
.altset_idx = 1,
2718+
.attributes = 0,
2719+
.endpoint = 0x82,
2720+
.ep_attr = USB_ENDPOINT_XFER_ISOC,
2721+
.datainterval = 1,
2722+
.maxpacksize = 0x0126,
26932723
.rates = SNDRV_PCM_RATE_44100 |
26942724
SNDRV_PCM_RATE_48000,
26952725
.rate_min = 44100,

0 commit comments

Comments
 (0)