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>

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 0db94ead1b93314ea9701babaf39351d061fb09d..ac521b71cb57106eac37e97f9f0742f105236ae0 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -3420,6 +3420,8 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
        case USB_ID(0x1235, 0x8213): /* Focusrite Scarlett 8i6 3rd Gen */
        case USB_ID(0x1235, 0x8214): /* Focusrite Scarlett 18i8 3rd Gen */
        case USB_ID(0x1235, 0x8215): /* Focusrite Scarlett 18i20 3rd Gen */
+       case USB_ID(0x1235, 0x8206): /* Focusrite Clarett 2Pre USB */
+       case USB_ID(0x1235, 0x8207): /* Focusrite Clarett 4Pre USB */
        case USB_ID(0x1235, 0x8208): /* Focusrite Clarett 8Pre USB */
        case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */
        case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index a2d97fa97f8196fb9b4b7bf058e33b429be7422e..6138aa475562ac4593975d4e89e324b90f506173 100644 (file)
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -5,7 +5,7 @@
  *   Supported models:
  *   - 6i6/18i8/18i20 Gen 2
  *   - Solo/2i2/4i4/8i6/18i8/18i20 Gen 3
- *   - Clarett 8Pre USB
+ *   - Clarett 2Pre/4Pre/8Pre USB
  *   - Clarett+ 2Pre/4Pre/8Pre
  *
  *   Copyright (c) 2018-2023 by Geoffrey D. Bennett <g at b4.vu>
@@ -64,6 +64,8 @@
  * Gregory Rozzo for donating a 4Pre, and David Sherwood and Patrice
  * Peterson for usbmon output).
  *
+ * Support for Clarett 2Pre and 4Pre USB added in Oct 2023.
+ *
  * This ALSA mixer gives access to (model-dependent):
  *  - input, output, mixer-matrix muxes
  *  - mixer-matrix gain stages
@@ -999,6 +1001,8 @@ static const struct scarlett2_device_entry scarlett2_devices[] = {
        { USB_ID(0x1235, 0x8215), &s18i20_gen3_info, "Scarlett Gen 3" },
 
        /* Supported Clarett USB/Clarett+ devices */
+       { USB_ID(0x1235, 0x8206), &clarett_2pre_info, "Clarett USB" },
+       { USB_ID(0x1235, 0x8207), &clarett_4pre_info, "Clarett USB" },
        { USB_ID(0x1235, 0x8208), &clarett_8pre_info, "Clarett USB" },
        { USB_ID(0x1235, 0x820a), &clarett_2pre_info, "Clarett+" },
        { USB_ID(0x1235, 0x820b), &clarett_4pre_info, "Clarett+" },
@@ -1197,7 +1201,7 @@ static const struct scarlett2_config
        [SCARLETT2_CONFIG_TALKBACK_MAP] = {
                .offset = 0xb0, .size = 16, .activate = 10 },
 
-/* Clarett+ 8Pre */
+/* Clarett USB and Clarett+ devices: 2Pre, 4Pre, 8Pre */
 }, {
        [SCARLETT2_CONFIG_DIM_MUTE] = {
                .offset = 0x31, .size = 8, .activate = 2 },