1 files changed, 59 insertions, 43 deletions

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 794224e1d6df..acbeb52f6fd6 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1149,27 +1149,17 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
         return false;
 }
 
-/* Marantz/Denon USB DACs need a vendor cmd to switch
+/* ITF-USB DSD based DACs need a vendor cmd to switch
  * between PCM and native DSD mode
  */
-static bool is_marantz_denon_dac(unsigned int id)
+static bool is_itf_usb_dsd_dac(unsigned int id)
 {
         switch (id) {
         case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */
         case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */
         case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */
-                return true;
-        }
-        return false;
-}
-
-/* TEAC UD-501/UD-503/NT-503 USB DACs need a vendor cmd to switch
- * between PCM/DOP and native DSD mode
- */
-static bool is_teac_dsd_dac(unsigned int id)
-{
-        switch (id) {
-        case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */
+        case USB_ID(0x1852, 0x5065): /* Luxman DA-06 */
+        case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-501V2/UD-503/NT-503 */
         case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */
         case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */
                 return true;
@@ -1183,7 +1173,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs,
         struct usb_device *dev = subs->dev;
         int err;
 
-        if (is_marantz_denon_dac(subs->stream->chip->usb_id)) {
+        if (is_itf_usb_dsd_dac(subs->stream->chip->usb_id)) {
                 /* First switch to alt set 0, otherwise the mode switch cmd
                  * will not be accepted by the DAC
                  */
@@ -1193,37 +1183,26 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs,
 
                 mdelay(20); /* Delay needed after setting the interface */
 
-                switch (fmt->altsetting) {
-                case 2: /* DSD mode requested */
-                case 1: /* PCM mode requested */
-                        err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 0,
-                                              USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
-                                              fmt->altsetting - 1, 1, NULL, 0);
-                        if (err < 0)
-                                return err;
-                        break;
-                }
-                mdelay(20);
-        } else if (is_teac_dsd_dac(subs->stream->chip->usb_id)) {
                 /* Vendor mode switch cmd is required. */
-                switch (fmt->altsetting) {
-                case 3: /* DSD mode (DSD_U32) requested */
+                if (fmt->formats & SNDRV_PCM_FMTBIT_DSD_U32_BE) {
+                        /* DSD mode (DSD_U32) requested */
                         err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 0,
                                               USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
                                               1, 1, NULL, 0);
                         if (err < 0)
                                 return err;
-                        break;
 
-                case 2: /* PCM or DOP mode (S32) requested */
-                case 1: /* PCM mode (S16) requested */
+                } else {
+                        /* PCM or DOP mode (S32) requested */
+                        /* PCM mode (S16) requested */
                         err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 0,
                                               USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
                                               0, 1, NULL, 0);
                         if (err < 0)
                                 return err;
-                        break;
+
                 }
+                mdelay(20);
         }
         return 0;
 }
@@ -1300,10 +1279,10 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
             (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
                 mdelay(20);
 
-        /* Marantz/Denon devices with USB DAC functionality need a delay
+        /* ITF-USB DSD based DACs functionality need a delay
          * after each class compliant request
          */
-        if (is_marantz_denon_dac(chip->usb_id)
+        if (is_itf_usb_dsd_dac(chip->usb_id)
             && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
                 mdelay(20);
 
@@ -1329,6 +1308,8 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
                                         struct audioformat *fp,
                                         unsigned int sample_bytes)
 {
+        struct usb_interface *iface;
+
         /* Playback Designs */
         if (USB_ID_VENDOR(chip->usb_id) == 0x23ba) {
                 switch (fp->altsetting) {
@@ -1390,17 +1371,52 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
                 break;
         }
 
-        /* Denon/Marantz devices with USB DAC functionality */
-        if (is_marantz_denon_dac(chip->usb_id)) {
-                if (fp->altsetting == 2)
-                        return SNDRV_PCM_FMTBIT_DSD_U32_BE;
-        }
+        /* ITF-USB DSD based DACs */
+        if (is_itf_usb_dsd_dac(chip->usb_id)) {
+                iface = usb_ifnum_to_if(chip->dev, fp->iface);
 
-        /* TEAC devices with USB DAC functionality */
-        if (is_teac_dsd_dac(chip->usb_id)) {
-                if (fp->altsetting == 3)
+                /* Altsetting 2 support native DSD if the num of altsets is
+                 * three (0-2),
+                 * Altsetting 3 support native DSD if the num of altsets is
+                 * four (0-3).
+                 */
+                if (fp->altsetting == iface->num_altsetting - 1)
                         return SNDRV_PCM_FMTBIT_DSD_U32_BE;
         }
 
         return 0;
 }
+
+void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
+                                          struct audioformat *fp,
+                                          int stream)
+{
+        switch (chip->usb_id) {
+        case USB_ID(0x0a92, 0x0053): /* AudioTrak Optoplay */
+                /* Optoplay sets the sample rate attribute although
+                 * it seems not supporting it in fact.
+                 */
+                fp->attributes &= ~UAC_EP_CS_ATTR_SAMPLE_RATE;
+                break;
+        case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */
+        case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
+                /* doesn't set the sample rate attribute, but supports it */
+                fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
+                break;
+        case USB_ID(0x0763, 0x2001):  /* M-Audio Quattro USB */
+        case USB_ID(0x0763, 0x2012):  /* M-Audio Fast Track Pro USB */
+        case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
+        case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
+                                        an older model 77d:223) */
+        /*
+         * plantronics headset and Griffin iMic have set adaptive-in
+         * although it's really not...
+         */
+                fp->ep_attr &= ~USB_ENDPOINT_SYNCTYPE;
+                if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        fp->ep_attr |= USB_ENDPOINT_SYNC_ADAPTIVE;
+                else
+                        fp->ep_attr |= USB_ENDPOINT_SYNC_SYNC;
+                break;
+        }
+}