tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support

It has been confirmed that all devices in the Focusrite Clarett USB
series work the same as the devices in the Clarett+ series. Add the
missing PIDs to enable support for the Clarett 2Pre and 4Pre USB.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/ZSFB8EVTG1PK1eq/@m.b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Geoffrey D. Bennett and committed by
Takashi Iwai 2b17b489 5eb4ff88

+8 -2
+2
sound/usb/mixer_quirks.c
··· 3420 3420 case USB_ID(0x1235, 0x8213): /* Focusrite Scarlett 8i6 3rd Gen */ 3421 3421 case USB_ID(0x1235, 0x8214): /* Focusrite Scarlett 18i8 3rd Gen */ 3422 3422 case USB_ID(0x1235, 0x8215): /* Focusrite Scarlett 18i20 3rd Gen */ 3423 + case USB_ID(0x1235, 0x8206): /* Focusrite Clarett 2Pre USB */ 3424 + case USB_ID(0x1235, 0x8207): /* Focusrite Clarett 4Pre USB */ 3423 3425 case USB_ID(0x1235, 0x8208): /* Focusrite Clarett 8Pre USB */ 3424 3426 case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */ 3425 3427 case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */
+6 -2
sound/usb/mixer_scarlett_gen2.c
··· 5 5 * Supported models: 6 6 * - 6i6/18i8/18i20 Gen 2 7 7 * - Solo/2i2/4i4/8i6/18i8/18i20 Gen 3 8 - * - Clarett 8Pre USB 8 + * - Clarett 2Pre/4Pre/8Pre USB 9 9 * - Clarett+ 2Pre/4Pre/8Pre 10 10 * 11 11 * Copyright (c) 2018-2023 by Geoffrey D. Bennett <g at b4.vu> ··· 63 63 * Support for Clarett+ 4Pre and 2Pre added in Sep 2023 (thanks to 64 64 * Gregory Rozzo for donating a 4Pre, and David Sherwood and Patrice 65 65 * Peterson for usbmon output). 66 + * 67 + * Support for Clarett 2Pre and 4Pre USB added in Oct 2023. 66 68 * 67 69 * This ALSA mixer gives access to (model-dependent): 68 70 * - input, output, mixer-matrix muxes ··· 1001 999 { USB_ID(0x1235, 0x8215), &s18i20_gen3_info, "Scarlett Gen 3" }, 1002 1000 1003 1001 /* Supported Clarett USB/Clarett+ devices */ 1002 + { USB_ID(0x1235, 0x8206), &clarett_2pre_info, "Clarett USB" }, 1003 + { USB_ID(0x1235, 0x8207), &clarett_4pre_info, "Clarett USB" }, 1004 1004 { USB_ID(0x1235, 0x8208), &clarett_8pre_info, "Clarett USB" }, 1005 1005 { USB_ID(0x1235, 0x820a), &clarett_2pre_info, "Clarett+" }, 1006 1006 { USB_ID(0x1235, 0x820b), &clarett_4pre_info, "Clarett+" }, ··· 1201 1197 [SCARLETT2_CONFIG_TALKBACK_MAP] = { 1202 1198 .offset = 0xb0, .size = 16, .activate = 10 }, 1203 1199 1204 - /* Clarett+ 8Pre */ 1200 + /* Clarett USB and Clarett+ devices: 2Pre, 4Pre, 8Pre */ 1205 1201 }, { 1206 1202 [SCARLETT2_CONFIG_DIM_MUTE] = { 1207 1203 .offset = 0x31, .size = 8, .activate = 2 },