Merge tag 'nfs-for-5.4-3' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-2.6-block.git] / sound / usb / mixer_quirks.c

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 27dcb3743690f7c29764fb978823f0f37ad9c977..39e27ae6c597e85fe1e4ba0b8d7d69d2c0edc63b 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -32,6 +32,7 @@
 #include "mixer.h"
 #include "mixer_quirks.h"
 #include "mixer_scarlett.h"
+#include "mixer_scarlett_gen2.h"
 #include "mixer_us16x08.h"
 #include "helper.h"
 
@@ -2258,6 +2259,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
                err = snd_scarlett_controls_create(mixer);
                break;
 
+       case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */
+       case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */
+       case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */
+               err = snd_scarlett_gen2_controls_create(mixer);
+               break;
+
        case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */
                err = snd_soundblaster_e1_switch_create(mixer);
                break;