8 files changed, 87 insertions, 8 deletions

diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
index aaafecf073ff..a96ed2ce3254 100644
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@ -189,6 +189,13 @@ struct uac2_iso_endpoint_descriptor {
 #define UAC2_CONTROL_DATA_OVERRUN       (3 << 2)
 #define UAC2_CONTROL_DATA_UNDERRUN      (3 << 4)
 
+/* 5.2.5.4.2 Connector Control Parameter Block */
+struct uac2_connectors_ctl_blk {
+        __u8 bNrChannels;
+        __le32 bmChannelConfig;
+        __u8 iChannelNames;
+} __attribute__((packed));
+
 /* 6.1 Interrupt Data Message */
 
 #define UAC2_INTERRUPT_DATA_MSG_VENDOR  (1 << 0)
diff --git a/include/linux/usb/audio-v3.h b/include/linux/usb/audio-v3.h
index a8959aaba0ae..a710e28b5215 100644
--- a/include/linux/usb/audio-v3.h
+++ b/include/linux/usb/audio-v3.h
@@ -221,6 +221,12 @@ struct uac3_iso_endpoint_descriptor {
         __le16 wLockDelay;
 } __attribute__((packed));
 
+/* 5.2.1.6.1 INSERTION CONTROL PARAMETER BLOCK */
+struct uac3_insertion_ctl_blk {
+        __u8 bSize;
+        __u8 bmConInserted;
+} __attribute__ ((packed));
+
 /* 6.1 INTERRUPT DATA MESSAGE */
 struct uac3_interrupt_data_msg {
         __u8 bInfo;
@@ -392,4 +398,38 @@ struct uac3_interrupt_data_msg {
 #define UAC3_AC_ACTIVE_INTERFACE_CONTROL        0x01
 #define UAC3_AC_POWER_DOMAIN_CONTROL            0x02
 
+/* A.23.5 TERMINAL CONTROL SELECTORS */
+#define UAC3_TE_UNDEFINED                       0x00
+#define UAC3_TE_INSERTION                       0x01
+#define UAC3_TE_OVERLOAD                        0x02
+#define UAC3_TE_UNDERFLOW                       0x03
+#define UAC3_TE_OVERFLOW                        0x04
+#define UAC3_TE_LATENCY                         0x05
+
+/* BADD predefined Unit/Terminal values */
+#define UAC3_BADD_IT_ID1        1  /* Input Terminal ID1: bTerminalID = 1 */
+#define UAC3_BADD_FU_ID2        2  /* Feature Unit ID2: bUnitID = 2 */
+#define UAC3_BADD_OT_ID3        3  /* Output Terminal ID3: bTerminalID = 3 */
+#define UAC3_BADD_IT_ID4        4  /* Input Terminal ID4: bTerminalID = 4 */
+#define UAC3_BADD_FU_ID5        5  /* Feature Unit ID5: bUnitID = 5 */
+#define UAC3_BADD_OT_ID6        6  /* Output Terminal ID6: bTerminalID = 6 */
+#define UAC3_BADD_FU_ID7        7  /* Feature Unit ID7: bUnitID = 7 */
+#define UAC3_BADD_MU_ID8        8  /* Mixer Unit ID8: bUnitID = 8 */
+#define UAC3_BADD_CS_ID9        9  /* Clock Source Entity ID9: bClockID = 9 */
+#define UAC3_BADD_PD_ID10       10 /* Power Domain ID10: bPowerDomainID = 10 */
+#define UAC3_BADD_PD_ID11       11 /* Power Domain ID11: bPowerDomainID = 11 */
+
+/* BADD wMaxPacketSize of AS endpoints */
+#define UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_16              0x0060
+#define UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_16             0x0062
+#define UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_24              0x0090
+#define UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_24             0x0093
+#define UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_16            0x00C0
+#define UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_16           0x00C4
+#define UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_24            0x0120
+#define UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_24           0x0126
+
+/* BADD sample rate is always fixed to 48kHz */
+#define UAC3_BADD_SAMPLING_RATE                         48000
+
 #endif /* __LINUX_USB_AUDIO_V3_H */
diff --git a/include/sound/core.h b/include/sound/core.h
index 5f181b875c2f..36a5934cf4b1 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -51,7 +51,6 @@ struct completion;
  */
 enum snd_device_type {
         SNDRV_DEV_LOWLEVEL,
-        SNDRV_DEV_CONTROL,
         SNDRV_DEV_INFO,
         SNDRV_DEV_BUS,
         SNDRV_DEV_CODEC,
@@ -62,6 +61,7 @@ enum snd_device_type {
         SNDRV_DEV_SEQUENCER,
         SNDRV_DEV_HWDEP,
         SNDRV_DEV_JACK,
+        SNDRV_DEV_CONTROL,      /* NOTE: this must be the last one */
 };
 
 enum snd_device_state {
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 5ebcc51c0a6a..8c1572de44c5 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1610,7 +1610,7 @@ struct snd_emu10k1_fx8010_pcm {
         struct snd_pcm_indirect pcm_rec;
         unsigned int tram_pos;
         unsigned int tram_shift;
-        struct snd_emu10k1_fx8010_irq *irq;
+        struct snd_emu10k1_fx8010_irq irq;
 };
 
 struct snd_emu10k1_fx8010 {
@@ -1902,7 +1902,7 @@ int snd_emu10k1_fx8010_register_irq_handler(struct snd_emu10k1 *emu,
                                             snd_fx8010_irq_handler_t *handler,
                                             unsigned char gpr_running,
                                             void *private_data,
-                                            struct snd_emu10k1_fx8010_irq **r_irq);
+                                            struct snd_emu10k1_fx8010_irq *irq);
 int snd_emu10k1_fx8010_unregister_irq_handler(struct snd_emu10k1 *emu,
                                               struct snd_emu10k1_fx8010_irq *irq);
 
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 06536e01ed94..c052afc27547 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -571,4 +571,9 @@ static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
         return (unsigned long)(ptr - array->list) / array->elem_size;
 }
 
+/* a helper macro to iterate for each snd_array element */
+#define snd_array_for_each(array, idx, ptr) \
+        for ((idx) = 0, (ptr) = (array)->list; (idx) < (array)->used; \
+             (ptr) = snd_array_elem(array, ++(idx)))
+
 #endif /* __SOUND_HDAUDIO_H */
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 782d1df34208..9c3db3dce32b 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -34,11 +34,9 @@ struct snd_dma_device {
         struct device *dev;             /* generic device */
 };
 
-#ifndef snd_dma_pci_data
 #define snd_dma_pci_data(pci)   (&(pci)->dev)
 #define snd_dma_isa_data()      NULL
 #define snd_dma_continuous_data(x)      ((struct device *)(__force unsigned long)(x))
-#endif
 
 
 /*
diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h
index 3a78e7145689..13d98e6e0db1 100644
--- a/include/uapi/linux/usb/audio.h
+++ b/include/uapi/linux/usb/audio.h
@@ -285,9 +285,22 @@ static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor
 static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
                                               int protocol)
 {
-        return (protocol == UAC_VERSION_1) ?
-                &desc->baSourceID[desc->bNrInPins + 4] :
-                &desc->baSourceID[desc->bNrInPins + 6];
+        switch (protocol) {
+        case UAC_VERSION_1:
+                return &desc->baSourceID[desc->bNrInPins + 4];
+        case UAC_VERSION_2:
+                return &desc->baSourceID[desc->bNrInPins + 6];
+        case UAC_VERSION_3:
+                return &desc->baSourceID[desc->bNrInPins + 2];
+        default:
+                return NULL;
+        }
+}
+
+static inline __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
+{
+        return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
+                desc->baSourceID[desc->bNrInPins];
 }
 
 static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
diff --git a/include/uapi/sound/tlv.h b/include/uapi/sound/tlv.h
index be5371f09a62..7d6d65f60a42 100644
--- a/include/uapi/sound/tlv.h
+++ b/include/uapi/sound/tlv.h
@@ -42,6 +42,10 @@
 #define SNDRV_CTL_TLVD_LENGTH(...) \
         ((unsigned int)sizeof((const unsigned int[]) { __VA_ARGS__ }))
 
+/* Accessor offsets for TLV data items */
+#define SNDRV_CTL_TLVO_TYPE             0
+#define SNDRV_CTL_TLVO_LEN              1
+
 #define SNDRV_CTL_TLVD_CONTAINER_ITEM(...) \
         SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_CONTAINER, __VA_ARGS__)
 #define SNDRV_CTL_TLVD_DECLARE_CONTAINER(name, ...) \
@@ -61,6 +65,10 @@
                 SNDRV_CTL_TLVD_DB_SCALE_ITEM(min, step, mute) \
         }
 
+/* Accessor offsets for min, mute and step items in dB scale type TLV */
+#define SNDRV_CTL_TLVO_DB_SCALE_MIN             2
+#define SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP   3
+
 /* dB scale specified with min/max values instead of step */
 #define SNDRV_CTL_TLVD_DB_MINMAX_ITEM(min_dB, max_dB) \
         SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_DB_MINMAX, (min_dB), (max_dB))
@@ -75,6 +83,10 @@
                 SNDRV_CTL_TLVD_DB_MINMAX_MUTE_ITEM(min_dB, max_dB) \
         }
 
+/* Accessor offsets for min, max items in db-minmax types of TLV. */
+#define SNDRV_CTL_TLVO_DB_MINMAX_MIN    2
+#define SNDRV_CTL_TLVO_DB_MINMAX_MAX    3
+
 /* linear volume between min_dB and max_dB (.01dB unit) */
 #define SNDRV_CTL_TLVD_DB_LINEAR_ITEM(min_dB, max_dB) \
         SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_DB_LINEAR, (min_dB), (max_dB))
@@ -83,6 +95,10 @@
                 SNDRV_CTL_TLVD_DB_LINEAR_ITEM(min_dB, max_dB) \
         }
 
+/* Accessor offsets for min, max items in db-linear type of TLV. */
+#define SNDRV_CTL_TLVO_DB_LINEAR_MIN    2
+#define SNDRV_CTL_TLVO_DB_LINEAR_MAX    3
+
 /* dB range container:
  * Items in dB range container must be ordered by their values and by their
  * dB values. This implies that larger values must correspond with larger