Commit 2307a0e1 authored by Egor Vorontsov's avatar Egor Vorontsov Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0) 



The patch applies the same quirks used for SC-01 at firmware v1.1.0 to
the ones running v1.0.0, with respect to hard-coded sample rates.

I got two more units and successfully tested the patch series with both
firmwares.

The support is now complete (not accounting ASIO).

Signed-off-by: default avatarEgor Vorontsov <sdoregor@sdore.me>
Link: https://lore.kernel.org/r/20220627100041.2861494-2-sdoregor@sdore.me


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

sound/usb/quirks-table.h

+132 −0
Original line number Diff line number Diff line
@@ -4167,6 +4167,138 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
		}

	}

},

{

	/*

	 * Fiero SC-01 (firmware v1.0.0 @ 48 kHz)

	 */

	USB_DEVICE(0x2b53, 0x0023),

	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {

		.vendor_name = "Fiero",

		.product_name = "SC-01",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_COMPOSITE,

		.data = &(const struct snd_usb_audio_quirk[]) {

			{

				.ifnum = 0,

				.type = QUIRK_AUDIO_STANDARD_INTERFACE

			},

			/* Playback */

			{

				.ifnum = 1,

				.type = QUIRK_AUDIO_FIXED_ENDPOINT,

				.data = &(const struct audioformat) {

					.formats = SNDRV_PCM_FMTBIT_S32_LE,

					.channels = 2,

					.fmt_bits = 24,

					.iface = 1,

					.altsetting = 1,

					.altset_idx = 1,

					.endpoint = 0x01,

					.ep_attr = USB_ENDPOINT_XFER_ISOC |

						   USB_ENDPOINT_SYNC_ASYNC,

					.rates = SNDRV_PCM_RATE_48000,

					.rate_min = 48000,

					.rate_max = 48000,

					.nr_rates = 1,

					.rate_table = (unsigned int[]) { 48000 },

					.clock = 0x29

				}

			},

			/* Capture */

			{

				.ifnum = 2,

				.type = QUIRK_AUDIO_FIXED_ENDPOINT,

				.data = &(const struct audioformat) {

					.formats = SNDRV_PCM_FMTBIT_S32_LE,

					.channels = 2,

					.fmt_bits = 24,

					.iface = 2,

					.altsetting = 1,

					.altset_idx = 1,

					.endpoint = 0x82,

					.ep_attr = USB_ENDPOINT_XFER_ISOC |

						   USB_ENDPOINT_SYNC_ASYNC |

						   USB_ENDPOINT_USAGE_IMPLICIT_FB,

					.rates = SNDRV_PCM_RATE_48000,

					.rate_min = 48000,

					.rate_max = 48000,

					.nr_rates = 1,

					.rate_table = (unsigned int[]) { 48000 },

					.clock = 0x29

				}

			},

			{

				.ifnum = -1

			}

		}

	}

},

{

	/*

	 * Fiero SC-01 (firmware v1.0.0 @ 96 kHz)

	 */

	USB_DEVICE(0x2b53, 0x0024),

	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {

		.vendor_name = "Fiero",

		.product_name = "SC-01",

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_COMPOSITE,

		.data = &(const struct snd_usb_audio_quirk[]) {

			{

				.ifnum = 0,

				.type = QUIRK_AUDIO_STANDARD_INTERFACE

			},

			/* Playback */

			{

				.ifnum = 1,

				.type = QUIRK_AUDIO_FIXED_ENDPOINT,

				.data = &(const struct audioformat) {

					.formats = SNDRV_PCM_FMTBIT_S32_LE,

					.channels = 2,

					.fmt_bits = 24,

					.iface = 1,

					.altsetting = 1,

					.altset_idx = 1,

					.endpoint = 0x01,

					.ep_attr = USB_ENDPOINT_XFER_ISOC |

						   USB_ENDPOINT_SYNC_ASYNC,

					.rates = SNDRV_PCM_RATE_96000,

					.rate_min = 96000,

					.rate_max = 96000,

					.nr_rates = 1,

					.rate_table = (unsigned int[]) { 96000 },

					.clock = 0x29

				}

			},

			/* Capture */

			{

				.ifnum = 2,

				.type = QUIRK_AUDIO_FIXED_ENDPOINT,

				.data = &(const struct audioformat) {

					.formats = SNDRV_PCM_FMTBIT_S32_LE,

					.channels = 2,

					.fmt_bits = 24,

					.iface = 2,

					.altsetting = 1,

					.altset_idx = 1,

					.endpoint = 0x82,

					.ep_attr = USB_ENDPOINT_XFER_ISOC |

						   USB_ENDPOINT_SYNC_ASYNC |

						   USB_ENDPOINT_USAGE_IMPLICIT_FB,

					.rates = SNDRV_PCM_RATE_96000,

					.rate_min = 96000,

					.rate_max = 96000,

					.nr_rates = 1,

					.rate_table = (unsigned int[]) { 96000 },

					.clock = 0x29

				}

			},

			{

				.ifnum = -1

			}

		}

	}

},

{

	/*

	 * Fiero SC-01 (firmware v1.1.0)

sound/usb/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -1915,6 +1915,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_ALIGN_TRANSFER),

	DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */

		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),

	DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */

		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),

	DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */

		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),