Commit f9cbf9d7 authored by Phil Elwell's avatar Phil Elwell Committed by popcornmix
Browse files

ALSA: usb-audio: generic DSD detection for XMOS-based implementations 



The second half of the refactorisation of pr2789, the first half being
the preceding back-port.

Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
parent 165a0d29

sound/usb/quirks.c

+27 −0
Original line number Diff line number Diff line
@@ -1356,19 +1356,44 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, 
	/* XMOS based USB DACs */

	switch (chip->usb_id) {

	case USB_ID(0x20b1, 0x3008): /* iFi Audio micro/nano iDSD */

	case USB_ID(0x1511, 0x0037): /* AURALiC VEGA */

	case USB_ID(0x20b1, 0x0002): /* Wyred 4 Sound DAC-2 DSD */

	case USB_ID(0x20b1, 0x2004): /* Matrix Audio X-SPDIF 2 */

	case USB_ID(0x20b1, 0x2008): /* Matrix Audio X-Sabre */

	case USB_ID(0x20b1, 0x300a): /* Matrix Audio Mini-i Pro */

	case USB_ID(0x22d9, 0x0416): /* OPPO HA-1 */

	case USB_ID(0x22d9, 0x0436): /* OPPO Sonica */

	case USB_ID(0x22d9, 0x0461): /* OPPO UDP-205 */

	case USB_ID(0x2522, 0x0012): /* LH Labs VI DAC Infinity */

	case USB_ID(0x2772, 0x0230): /* Pro-Ject Pre Box S2 Digital */

		if (fp->altsetting == 2)

			return SNDRV_PCM_FMTBIT_DSD_U32_BE;

		break;



	case USB_ID(0x152a, 0x85de): /* SMSL D1 DAC */

	case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */

	case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */

	case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */

	case USB_ID(0x16d0, 0x0733): /* Furutech ADL Stratos */

	case USB_ID(0x16d0, 0x09db): /* NuPrime Audio DAC-9 */

	case USB_ID(0x1db5, 0x0003): /* Bryston BDA3 */

	case USB_ID(0x20b1, 0x000a): /* Gustard DAC-X20U */

	case USB_ID(0x20b1, 0x2005): /* Denafrips Ares DAC */

	case USB_ID(0x20b1, 0x2009): /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */

	case USB_ID(0x20b1, 0x2023): /* JLsounds I2SoverUSB */

	case USB_ID(0x20b1, 0x3021): /* Eastern El. MiniMax Tube DAC Supreme */

	case USB_ID(0x20b1, 0x3023): /* Aune X1S 32BIT/384 DSD DAC */

	case USB_ID(0x20b1, 0x302d): /* Unison Research Unico CD Due */

	case USB_ID(0x20b1, 0x307b): /* CH Precision C1 DAC */

	case USB_ID(0x20b1, 0x3086): /* Singxer F-1 converter board */

	case USB_ID(0x22d9, 0x0426): /* OPPO HA-2 */

	case USB_ID(0x22e1, 0xca01): /* HDTA Serenade DSD */

	case USB_ID(0x249c, 0x9326): /* M2Tech Young MkIII */

	case USB_ID(0x2616, 0x0106): /* PS Audio NuWave DAC */

	case USB_ID(0x2622, 0x0041): /* Audiolab M-DAC+ */

	case USB_ID(0x27f7, 0x3002): /* W4S DAC-2v2SE */

	case USB_ID(0x29a2, 0x0086): /* Mutec MC3+ USB */

	case USB_ID(0x6b42, 0x0042): /* MSB Technology */

		if (fp->altsetting == 3)

			return SNDRV_PCM_FMTBIT_DSD_U32_BE;

		break;
@@ -1415,6 +1440,8 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, 
	 * from XMOS/Thesycon

	 */

	switch (USB_ID_VENDOR(chip->usb_id)) {

	case 0x20b1:  /* XMOS based devices */

	case 0x152a:  /* Thesycon devices */

	case 0x25ce:  /* Mytek devices */

		if (fp->dsd_raw)

			return SNDRV_PCM_FMTBIT_DSD_U32_BE;