Commit b9a98cdd authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Takashi Iwai
Browse files

ALSA: scarlett2: Add support for Clarett 8Pre USB 



The Clarett 8Pre USB works the same as the Clarett+ 8Pre, only the USB
ID is different.

Tested-by: default avatarPhilippe Perrot <philippe@perrot-net.fr>
Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/e59f47b29e2037f031b56bde10474c6e96e31ba5.1694705811.git.g@b4.vu


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d98cc489

sound/usb/mixer_quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -3420,6 +3420,7 @@ 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, 0x8208): /* Focusrite Clarett 8Pre USB */

	case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */

		err = snd_scarlett_gen2_init(mixer);

		break;

sound/usb/mixer_scarlett_gen2.c

+8 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *   Focusrite Scarlett Gen 2/3 and Clarett+ Driver for ALSA

 *   Focusrite Scarlett Gen 2/3 and Clarett USB/Clarett+ Driver for ALSA

 *

 *   Supported models:

 *   - 6i6/18i8/18i20 Gen 2

 *   - Solo/2i2/4i4/8i6/18i8/18i20 Gen 3

 *   - Clarett 8Pre USB

 *   - Clarett+ 8Pre

 *

 *   Copyright (c) 2018-2022 by Geoffrey D. Bennett <g at b4.vu>

 *   Copyright (c) 2018-2023 by Geoffrey D. Bennett <g at b4.vu>

 *   Copyright (c) 2020-2021 by Vladimir Sadovnikov <sadko4u@gmail.com>

 *   Copyright (c) 2022 by Christian Colglazier <christian@cacolglazier.com>

 *
@@ -56,6 +57,9 @@ 
 * Support for Clarett+ 8Pre added in Aug 2022 by Christian

 * Colglazier.

 *

 * Support for Clarett 8Pre USB added in Sep 2023 (thanks to Philippe

 * Perrot for confirmation).

 *

 * This ALSA mixer gives access to (model-dependent):

 *  - input, output, mixer-matrix muxes

 *  - mixer-matrix gain stages
@@ -899,7 +903,8 @@ static const struct scarlett2_device_entry scarlett2_devices[] = { 
	{ USB_ID(0x1235, 0x8214), &s18i8_gen3_info },

	{ USB_ID(0x1235, 0x8215), &s18i20_gen3_info },



	/* Supported Clarett+ devices */

	/* Supported Clarett USB/Clarett+ devices */

	{ USB_ID(0x1235, 0x8208), &clarett_8pre_info },

	{ USB_ID(0x1235, 0x820c), &clarett_8pre_info },



	/* End of list */