2 files changed, 27 insertions, 0 deletions

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 7b166c2be0f7..69e93a9d486a 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1506,6 +1506,12 @@ static struct port_info {
         PORT_INFO(vendor, product, num, name, 0, \
                   SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \
                   SNDRV_SEQ_PORT_TYPE_HARDWARE)
+#define GM_SYNTH_PORT(vendor, product, num, name, voices) \
+        PORT_INFO(vendor, product, num, name, voices, \
+                  SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \
+                  SNDRV_SEQ_PORT_TYPE_MIDI_GM | \
+                  SNDRV_SEQ_PORT_TYPE_HARDWARE | \
+                  SNDRV_SEQ_PORT_TYPE_SYNTHESIZER)
 #define ROLAND_SYNTH_PORT(vendor, product, num, name, voices) \
         PORT_INFO(vendor, product, num, name, voices, \
                   SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \
@@ -1525,6 +1531,11 @@ static struct port_info {
                   SNDRV_SEQ_PORT_TYPE_MIDI_MT32 | \
                   SNDRV_SEQ_PORT_TYPE_HARDWARE | \
                   SNDRV_SEQ_PORT_TYPE_SYNTHESIZER)
+        /* Yamaha MOTIF XF */
+        GM_SYNTH_PORT(0x0499, 0x105c, 0, "%s Tone Generator", 128),
+        CONTROL_PORT(0x0499, 0x105c, 1, "%s Remote Control"),
+        EXTERNAL_PORT(0x0499, 0x105c, 2, "%s Thru"),
+        CONTROL_PORT(0x0499, 0x105c, 3, "%s Editor"),
         /* Roland UA-100 */
         CONTROL_PORT(0x0582, 0x0000, 2, "%s Control"),
         /* Roland SC-8850 */
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 19a921eb75f1..d2aa45a8d895 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1174,5 +1174,21 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
                 }
         }
 
+        /* XMOS based USB DACs */
+        switch (chip->usb_id) {
+        /* iFi Audio micro/nano iDSD */
+        case USB_ID(0x20b1, 0x3008):
+                if (fp->altsetting == 2)
+                        return SNDRV_PCM_FMTBIT_DSD_U32_LE;
+                break;
+        /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */
+        case USB_ID(0x20b1, 0x2009):
+                if (fp->altsetting == 3)
+                        return SNDRV_PCM_FMTBIT_DSD_U32_LE;
+                break;
+        default:
+                break;
+        }
+
         return 0;
 }