Commit 64bf8dec authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/scarlett2' into for-next 



Pull Scarlett2 USB audio mixer extensions.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 3abf66a4 4a2c8cc1

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -8272,11 +8272,14 @@ L: linux-input@vger.kernel.org 
S:	Maintained

F:	drivers/input/joystick/fsia6b.c









FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER









FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett)









M:	Geoffrey D. Bennett <g@b4.vu>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git









W:	https://github.com/geoffreybennett/scarlett-gen2









B:	https://github.com/geoffreybennett/scarlett-gen2/issues









T:	git https://github.com/geoffreybennett/scarlett-gen2.git









F:	include/uapi/sound/scarlett2.h









F:	sound/usb/mixer_scarlett2.c

















FORCEDETH GIGABIT ETHERNET DRIVER
































include/uapi/sound/scarlett2.h
0 → 100644



+54
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */









/*









 *   Focusrite Scarlett 2 Protocol Driver for ALSA









 *   (including Scarlett 2nd Gen, 3rd Gen, 4th Gen, Clarett USB, and









 *   Clarett+ series products)









 *









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









 */









#ifndef __UAPI_SOUND_SCARLETT2_H









#define __UAPI_SOUND_SCARLETT2_H



















#include <linux/types.h>









#include <linux/ioctl.h>



















#define SCARLETT2_HWDEP_MAJOR 1









#define SCARLETT2_HWDEP_MINOR 0









#define SCARLETT2_HWDEP_SUBMINOR 0



















#define SCARLETT2_HWDEP_VERSION \









	((SCARLETT2_HWDEP_MAJOR << 16) | \









	 (SCARLETT2_HWDEP_MINOR << 8) | \









	  SCARLETT2_HWDEP_SUBMINOR)



















#define SCARLETT2_HWDEP_VERSION_MAJOR(v) (((v) >> 16) & 0xFF)









#define SCARLETT2_HWDEP_VERSION_MINOR(v) (((v) >> 8) & 0xFF)









#define SCARLETT2_HWDEP_VERSION_SUBMINOR(v) ((v) & 0xFF)



















/* Get protocol version */









#define SCARLETT2_IOCTL_PVERSION _IOR('S', 0x60, int)



















/* Reboot */









#define SCARLETT2_IOCTL_REBOOT _IO('S', 0x61)



















/* Select flash segment */









#define SCARLETT2_SEGMENT_ID_SETTINGS 0









#define SCARLETT2_SEGMENT_ID_FIRMWARE 1









#define SCARLETT2_SEGMENT_ID_COUNT 2



















#define SCARLETT2_IOCTL_SELECT_FLASH_SEGMENT _IOW('S', 0x62, int)



















/* Erase selected flash segment */









#define SCARLETT2_IOCTL_ERASE_FLASH_SEGMENT _IO('S', 0x63)



















/* Get selected flash segment erase progress









 * 1 through to num_blocks, or 255 for complete









 */









struct scarlett2_flash_segment_erase_progress {









	unsigned char progress;









	unsigned char num_blocks;









};









#define SCARLETT2_IOCTL_GET_ERASE_PROGRESS \









	_IOR('S', 0x64, struct scarlett2_flash_segment_erase_progress)



















#endif /* __UAPI_SOUND_SCARLETT2_H */
























sound/usb/mixer_quirks.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -3447,6 +3447,9 @@ 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, 0x8218): /* Focusrite Scarlett Solo 4th Gen */









	case USB_ID(0x1235, 0x8219): /* Focusrite Scarlett 2i2 4th Gen */









	case USB_ID(0x1235, 0x821a): /* Focusrite Scarlett 4i4 4th 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 */
































sound/usb/mixer_scarlett2.c



+4023
−822




























File changed.
Preview size limit exceeded, changes collapsed.