summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorAmin Dandache <amin.dandache@gmail.com>2025-02-27 14:30:27 +0100
committerTakashi Iwai <tiwai@suse.de>2025-02-28 10:33:51 +0100
commit080564558eb1373c40e6c8447219376c1e089b9f (patch)
treee1bc833367502ad8b81001cbb156bbedf41218f8 /sound/usb
parente747104c99fd3a97044e734b0cad9a6227699937 (diff)
downloadlinux-080564558eb1373c40e6c8447219376c1e089b9f.tar.gz
linux-080564558eb1373c40e6c8447219376c1e089b9f.tar.bz2
linux-080564558eb1373c40e6c8447219376c1e089b9f.zip
ALSA: usb-audio: enable support for Presonus Studio 1824c within 1810c file
This patch adds support for Presonus Studio 1824c, a usb interface that's UAC2 compliant and it is enabled by identifying the device ID 194f:010d and works with the code brought in by the 1810c change from Nick Kossifidis in 2020-02-15. More infos on the card: https://www.presonus.com/products/Studio-1824c Signed-off-by: Amin Dandache <amin.dandache@gmail.com> Link: https://patch.msgid.link/20250227133027.21148-1-git@amin85.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/format.c4
-rw-r--r--sound/usb/mixer_quirks.c3
-rw-r--r--sound/usb/quirks.c4
3 files changed, 10 insertions, 1 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c
index 6049d957694c..9d32b21a5fbb 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -384,6 +384,10 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
!s1810c_valid_sample_rate(fp, rate))
goto skip_rate;
+ /* Filter out invalid rates on Presonus Studio 1824c */
+ if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
+ !s1810c_valid_sample_rate(fp, rate))
+ goto skip_rate;
/* Filter out invalid rates on Focusrite devices */
if (USB_ID_VENDOR(chip->usb_id) == 0x1235 &&
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index ed6127b0389f..79c8c1540ee2 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -4119,6 +4119,9 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
err = snd_sc1810_init_mixer(mixer);
break;
+ case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
+ err = snd_sc1810_init_mixer(mixer);
+ break;
case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
err = snd_bbfpro_controls_create(mixer);
break;
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index a97efb7b131e..dea8bfaa7e91 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1599,7 +1599,9 @@ int snd_usb_apply_interface_quirk(struct snd_usb_audio *chip,
/* presonus studio 1810c: skip altsets incompatible with device_setup */
if (chip->usb_id == USB_ID(0x194f, 0x010c))
return s1810c_skip_setting_quirk(chip, iface, altno);
-
+ /* presonus studio 1824c: skip altsets incompatible with device_setup */
+ if (chip->usb_id == USB_ID(0x194f, 0x010d))
+ return s1810c_skip_setting_quirk(chip, iface, altno);
return 0;
}