Commit 74dc71f8 authored by Nobutaka Okabe's avatar Nobutaka Okabe Committed by Takashi Iwai

ALSA: usb-audio: FIX native DSD support for TEAC UD-501 DAC

There are two versions of TEAC UD-501, the normal version and
the vendor updated version(UD-501V2).

They have the same VID/PID, but the num of the altsetting is different,
UD-501 has 2 altsets for stream, and UD-501V2 has 3.

So, add the logic to distinguish them by the Product Name, not by the PID.
Signed-off-by: default avatarNobutaka Okabe <nob77413@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 71426535
...@@ -1153,14 +1153,23 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) ...@@ -1153,14 +1153,23 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
* between PCM and native DSD mode * between PCM and native DSD mode
* (2 altsets version) * (2 altsets version)
*/ */
static bool is_itf_usb_dsd_2alts_dac(unsigned int id) static bool is_itf_usb_dsd_2alts_dac(struct snd_usb_audio *chip)
{ {
switch (id) { char *product = chip->dev->product; /* DAC product name */
switch (chip->usb_id) {
case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */ case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */
case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */
case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */
case USB_ID(0x1852, 0x5065): /* Luxman DA-06 */ case USB_ID(0x1852, 0x5065): /* Luxman DA-06 */
return true; return true;
case USB_ID(0x0644, 0x8043):
/* TEAC UD-501 */
if (product && strcmp("UD-501", product)) {
return true;
} else {
return false;
}
} }
return false; return false;
} }
...@@ -1169,13 +1178,21 @@ static bool is_itf_usb_dsd_2alts_dac(unsigned int id) ...@@ -1169,13 +1178,21 @@ static bool is_itf_usb_dsd_2alts_dac(unsigned int id)
* between PCM and native DSD mode * between PCM and native DSD mode
* (3 altsets version) * (3 altsets version)
*/ */
static bool is_itf_usb_dsd_3alts_dac(unsigned int id) static bool is_itf_usb_dsd_3alts_dac(struct snd_usb_audio *chip)
{ {
switch (id) { char *product = chip->dev->product; /* DAC product name */
case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */
switch (chip->usb_id) {
case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */ case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */
case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */ case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */
return true; return true;
case USB_ID(0x0644, 0x8043):
/* TEAC UD-501V2/UD-503/NT-503 */
if (product && !strcmp("UD-501", product)) {
return true;
} else {
return false;
}
} }
return false; return false;
} }
...@@ -1186,7 +1203,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, ...@@ -1186,7 +1203,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs,
struct usb_device *dev = subs->dev; struct usb_device *dev = subs->dev;
int err; int err;
if (is_itf_usb_dsd_2alts_dac(subs->stream->chip->usb_id)) { if (is_itf_usb_dsd_2alts_dac(subs->stream->chip)) {
/* First switch to alt set 0, otherwise the mode switch cmd /* First switch to alt set 0, otherwise the mode switch cmd
* will not be accepted by the DAC * will not be accepted by the DAC
*/ */
...@@ -1207,7 +1224,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, ...@@ -1207,7 +1224,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs,
break; break;
} }
mdelay(20); mdelay(20);
} else if (is_itf_usb_dsd_3alts_dac(subs->stream->chip->usb_id)) { } else if (is_itf_usb_dsd_3alts_dac(subs->stream->chip)) {
/* Vendor mode switch cmd is required. */ /* Vendor mode switch cmd is required. */
switch (fmt->altsetting) { switch (fmt->altsetting) {
case 3: /* DSD mode (DSD_U32) requested */ case 3: /* DSD mode (DSD_U32) requested */
...@@ -1306,7 +1323,7 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, ...@@ -1306,7 +1323,7 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
/* ITF-USB DSD based DACs functionality need a delay /* ITF-USB DSD based DACs functionality need a delay
* after each class compliant request * after each class compliant request
*/ */
if (is_itf_usb_dsd_2alts_dac(chip->usb_id) if (is_itf_usb_dsd_2alts_dac(chip)
&& (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
mdelay(20); mdelay(20);
...@@ -1394,13 +1411,13 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, ...@@ -1394,13 +1411,13 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
} }
/* ITF-USB DSD based DACs (2 altsets version) */ /* ITF-USB DSD based DACs (2 altsets version) */
if (is_itf_usb_dsd_2alts_dac(chip->usb_id)) { if (is_itf_usb_dsd_2alts_dac(chip)) {
if (fp->altsetting == 2) if (fp->altsetting == 2)
return SNDRV_PCM_FMTBIT_DSD_U32_BE; return SNDRV_PCM_FMTBIT_DSD_U32_BE;
} }
/* ITF-USB DSD based DACs (3 altsets version) */ /* ITF-USB DSD based DACs (3 altsets version) */
if (is_itf_usb_dsd_3alts_dac(chip->usb_id)) { if (is_itf_usb_dsd_3alts_dac(chip)) {
if (fp->altsetting == 3) if (fp->altsetting == 3)
return SNDRV_PCM_FMTBIT_DSD_U32_BE; return SNDRV_PCM_FMTBIT_DSD_U32_BE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment