mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
[ Upstream commit efc3d7d203
]
This driver was originally developed for the Focusrite Scarlett Gen 2
series. Since then Focusrite have used a similar protocol for their
Gen 3, Gen 4, Clarett USB, Clarett+, and Vocaster series.
Let's call this common protocol the "Scarlett 2 Protocol" and rename
the driver to scarlett2 to not imply that it is restricted to Gen 2
series devices.
Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/e1ad7f69a1e20cdb39094164504389160c1a0a0b.1698342632.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
39f932d295
commit
7989b04d6c
6 changed files with 18 additions and 16 deletions
|
@ -8031,7 +8031,7 @@ M: Geoffrey D. Bennett <g@b4.vu>
|
||||||
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
|
||||||
F: sound/usb/mixer_scarlett_gen2.c
|
F: sound/usb/mixer_scarlett2.c
|
||||||
|
|
||||||
FORCEDETH GIGABIT ETHERNET DRIVER
|
FORCEDETH GIGABIT ETHERNET DRIVER
|
||||||
M: Rain River <rain.1986.08.12@gmail.com>
|
M: Rain River <rain.1986.08.12@gmail.com>
|
||||||
|
|
|
@ -12,7 +12,7 @@ snd-usb-audio-objs := card.o \
|
||||||
mixer.o \
|
mixer.o \
|
||||||
mixer_quirks.o \
|
mixer_quirks.o \
|
||||||
mixer_scarlett.o \
|
mixer_scarlett.o \
|
||||||
mixer_scarlett_gen2.o \
|
mixer_scarlett2.o \
|
||||||
mixer_us16x08.o \
|
mixer_us16x08.o \
|
||||||
mixer_s1810c.o \
|
mixer_s1810c.o \
|
||||||
pcm.o \
|
pcm.o \
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include "mixer.h"
|
#include "mixer.h"
|
||||||
#include "mixer_quirks.h"
|
#include "mixer_quirks.h"
|
||||||
#include "mixer_scarlett.h"
|
#include "mixer_scarlett.h"
|
||||||
#include "mixer_scarlett_gen2.h"
|
#include "mixer_scarlett2.h"
|
||||||
#include "mixer_us16x08.h"
|
#include "mixer_us16x08.h"
|
||||||
#include "mixer_s1810c.h"
|
#include "mixer_s1810c.h"
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
|
@ -3453,7 +3453,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
|
||||||
case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */
|
case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */
|
||||||
case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */
|
case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */
|
||||||
case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */
|
case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */
|
||||||
err = snd_scarlett_gen2_init(mixer);
|
err = snd_scarlett2_init(mixer);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */
|
case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
/*
|
/*
|
||||||
* Focusrite Scarlett Gen 2/3 and Clarett USB/Clarett+ Driver for ALSA
|
* Focusrite Scarlett 2 Protocol Driver for ALSA
|
||||||
|
* (including Scarlett 2nd Gen, 3rd Gen, Clarett USB, and Clarett+
|
||||||
|
* series products)
|
||||||
*
|
*
|
||||||
* Supported models:
|
* Supported models:
|
||||||
* - 6i6/18i8/18i20 Gen 2
|
* - 6i6/18i8/18i20 Gen 2
|
||||||
|
@ -149,7 +151,7 @@
|
||||||
#include "mixer.h"
|
#include "mixer.h"
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
|
|
||||||
#include "mixer_scarlett_gen2.h"
|
#include "mixer_scarlett2.h"
|
||||||
|
|
||||||
/* device_setup value to allow turning MSD mode back on */
|
/* device_setup value to allow turning MSD mode back on */
|
||||||
#define SCARLETT2_MSD_ENABLE 0x02
|
#define SCARLETT2_MSD_ENABLE 0x02
|
||||||
|
@ -4251,7 +4253,7 @@ static const struct scarlett2_device_entry *get_scarlett2_device_entry(
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int snd_scarlett_gen2_controls_create(
|
static int snd_scarlett2_controls_create(
|
||||||
struct usb_mixer_interface *mixer,
|
struct usb_mixer_interface *mixer,
|
||||||
const struct scarlett2_device_entry *entry)
|
const struct scarlett2_device_entry *entry)
|
||||||
{
|
{
|
||||||
|
@ -4339,7 +4341,7 @@ static int snd_scarlett_gen2_controls_create(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer)
|
int snd_scarlett2_init(struct usb_mixer_interface *mixer)
|
||||||
{
|
{
|
||||||
struct snd_usb_audio *chip = mixer->chip;
|
struct snd_usb_audio *chip = mixer->chip;
|
||||||
const struct scarlett2_device_entry *entry;
|
const struct scarlett2_device_entry *entry;
|
||||||
|
@ -4378,7 +4380,7 @@ int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer)
|
||||||
entry->series_name,
|
entry->series_name,
|
||||||
USB_ID_PRODUCT(chip->usb_id));
|
USB_ID_PRODUCT(chip->usb_id));
|
||||||
|
|
||||||
err = snd_scarlett_gen2_controls_create(mixer, entry);
|
err = snd_scarlett2_controls_create(mixer, entry);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
usb_audio_err(mixer->chip,
|
usb_audio_err(mixer->chip,
|
||||||
"Error initialising %s Mixer Driver: %d",
|
"Error initialising %s Mixer Driver: %d",
|
7
sound/usb/mixer_scarlett2.h
Normal file
7
sound/usb/mixer_scarlett2.h
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
#ifndef __USB_MIXER_SCARLETT2_H
|
||||||
|
#define __USB_MIXER_SCARLETT2_H
|
||||||
|
|
||||||
|
int snd_scarlett2_init(struct usb_mixer_interface *mixer);
|
||||||
|
|
||||||
|
#endif /* __USB_MIXER_SCARLETT2_H */
|
|
@ -1,7 +0,0 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef __USB_MIXER_SCARLETT_GEN2_H
|
|
||||||
#define __USB_MIXER_SCARLETT_GEN2_H
|
|
||||||
|
|
||||||
int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer);
|
|
||||||
|
|
||||||
#endif /* __USB_MIXER_SCARLETT_GEN2_H */
|
|
Loading…
Reference in a new issue