Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda-intel - fix wallclk variable update and condition
  ALSA: asihpi - Fix uninitialized variable
  ALSA: hda: Use LPIB for ASUS M2V
  usb/gadget: Replace the old USB audio FU definitions in f_audio.c
  ASoC: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1
  ASoC: Add missing Kconfig entry for Phytec boards
  ALSA: usb-audio: export UAC2 clock selectors as mixer controls
  ALSA: usb-audio: clean up find_audio_control_unit()
  ALSA: usb-audio: add UAC2 sepecific Feature Unit controls
  ALSA: usb-audio: unify constants from specification
  ALSA: usb-audio: parse clock topology of UAC2 devices
  ALSA: usb-audio: fix selector unit string index accessor
  include/linux/usb/audio-v2.h: add more UAC2 details
  ALSA: usb-audio: support partially write-protected UAC2 controls
  ALSA: usb-audio: UAC2: clean up parsing of bmaControls
  ALSA: hda: Use LPIB for another mainboard
  ALSA: hda: Use mb31 quirk for an iMac model
  ALSA: hda: Use LPIB for an ASUS device

2 files changed, 94 insertions, 27 deletions

diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
index 92f1d99f0f17..383b94ba8c20 100644
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@ -18,6 +18,16 @@
 /* v1.0 and v2.0 of this standard have many things in common. For the rest
  * of the definitions, please refer to audio.h */
 
+static inline bool uac2_control_is_readable(u32 bmControls, u8 control)
+{
+        return (bmControls >> (control * 2)) & 0x1;
+}
+
+static inline bool uac2_control_is_writeable(u32 bmControls, u8 control)
+{
+        return (bmControls >> (control * 2)) & 0x2;
+}
+
 /* 4.7.2.1 Clock Source Descriptor */
 
 struct uac_clock_source_descriptor {
@@ -31,6 +41,13 @@ struct uac_clock_source_descriptor {
         __u8 iClockSource;
 } __attribute__((packed));
 
+/* bmAttribute fields */
+#define UAC_CLOCK_SOURCE_TYPE_EXT       0x0
+#define UAC_CLOCK_SOURCE_TYPE_INT_FIXED 0x1
+#define UAC_CLOCK_SOURCE_TYPE_INT_VAR   0x2
+#define UAC_CLOCK_SOURCE_TYPE_INT_PROG  0x3
+#define UAC_CLOCK_SOURCE_SYNCED_TO_SOF  (1 << 2)
+
 /* 4.7.2.2 Clock Source Descriptor */
 
 struct uac_clock_selector_descriptor {
@@ -39,8 +56,20 @@ struct uac_clock_selector_descriptor {
         __u8 bDescriptorSubtype;
         __u8 bClockID;
         __u8 bNrInPins;
-        __u8 bmControls;
         __u8 baCSourceID[];
+        /* bmControls, bAssocTerminal and iClockSource omitted */
+} __attribute__((packed));
+
+/* 4.7.2.3 Clock Multiplier Descriptor */
+
+struct uac_clock_multiplier_descriptor {
+        __u8 bLength;
+        __u8 bDescriptorType;
+        __u8 bDescriptorSubtype;
+        __u8 bClockID;
+        __u8 bCSourceID;
+        __u8 bmControls;
+        __u8 iClockMultiplier;
 } __attribute__((packed));
 
 /* 4.7.2.4 Input terminal descriptor */
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index 5d646c388752..c51200c715e5 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -47,6 +47,15 @@
 #define UAC_FORMAT_TYPE                 0x02
 #define UAC_FORMAT_SPECIFIC             0x03
 
+/* A.7 Processing Unit Process Types */
+#define UAC_PROCESS_UNDEFINED           0x00
+#define UAC_PROCESS_UP_DOWNMIX          0x01
+#define UAC_PROCESS_DOLBY_PROLOGIC      0x02
+#define UAC_PROCESS_STEREO_EXTENDER     0x03
+#define UAC_PROCESS_REVERB              0x04
+#define UAC_PROCESS_CHORUS              0x05
+#define UAC_PROCESS_DYN_RANGE_COMP      0x06
+
 /* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
 #define UAC_EP_GENERAL                  0x01
 
@@ -73,6 +82,60 @@
 
 #define UAC_GET_STAT                    0xff
 
+/* A.10 Control Selector Codes */
+
+/* A.10.1 Terminal Control Selectors */
+#define UAC_TERM_COPY_PROTECT           0x01
+
+/* A.10.2 Feature Unit Control Selectors */
+#define UAC_FU_MUTE                     0x01
+#define UAC_FU_VOLUME                   0x02
+#define UAC_FU_BASS                     0x03
+#define UAC_FU_MID                      0x04
+#define UAC_FU_TREBLE                   0x05
+#define UAC_FU_GRAPHIC_EQUALIZER        0x06
+#define UAC_FU_AUTOMATIC_GAIN           0x07
+#define UAC_FU_DELAY                    0x08
+#define UAC_FU_BASS_BOOST               0x09
+#define UAC_FU_LOUDNESS                 0x0a
+
+#define UAC_CONTROL_BIT(CS)     (1 << ((CS) - 1))
+
+/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
+#define UAC_UD_ENABLE                   0x01
+#define UAC_UD_MODE_SELECT              0x02
+
+/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
+#define UAC_DP_ENABLE                   0x01
+#define UAC_DP_MODE_SELECT              0x02
+
+/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
+#define UAC_3D_ENABLE                   0x01
+#define UAC_3D_SPACE                    0x02
+
+/* A.10.3.4 Reverberation Processing Unit Control Selectors */
+#define UAC_REVERB_ENABLE               0x01
+#define UAC_REVERB_LEVEL                0x02
+#define UAC_REVERB_TIME                 0x03
+#define UAC_REVERB_FEEDBACK             0x04
+
+/* A.10.3.5 Chorus Processing Unit Control Selectors */
+#define UAC_CHORUS_ENABLE               0x01
+#define UAC_CHORUS_LEVEL                0x02
+#define UAC_CHORUS_RATE                 0x03
+#define UAC_CHORUS_DEPTH                0x04
+
+/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
+#define UAC_DCR_ENABLE                  0x01
+#define UAC_DCR_RATE                    0x02
+#define UAC_DCR_MAXAMPL                 0x03
+#define UAC_DCR_THRESHOLD               0x04
+#define UAC_DCR_ATTACK_TIME             0x05
+#define UAC_DCR_RELEASE_TIME            0x06
+
+/* A.10.4 Extension Unit Control Selectors */
+#define UAC_XU_ENABLE                   0x01
+
 /* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
 #define UAC_MS_HEADER                   0x01
 #define UAC_MIDI_IN_JACK                0x02
@@ -244,7 +307,7 @@ struct uac_selector_unit_descriptor {
 static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
 {
         __u8 *raw = (__u8 *) desc;
-        return raw[9 + desc->bLength - 1];
+        return raw[desc->bLength - 1];
 }
 
 /* 4.3.2.5 Feature Unit Descriptor */
@@ -463,31 +526,6 @@ struct uac_iso_endpoint_descriptor {
 #define UAC_EP_CS_ATTR_PITCH_CONTROL    0x02
 #define UAC_EP_CS_ATTR_FILL_MAX         0x80
 
-/* A.10.2 Feature Unit Control Selectors */
-
-#define UAC_FU_CONTROL_UNDEFINED        0x00
-#define UAC_MUTE_CONTROL                0x01
-#define UAC_VOLUME_CONTROL              0x02
-#define UAC_BASS_CONTROL                0x03
-#define UAC_MID_CONTROL                 0x04
-#define UAC_TREBLE_CONTROL              0x05
-#define UAC_GRAPHIC_EQUALIZER_CONTROL   0x06
-#define UAC_AUTOMATIC_GAIN_CONTROL      0x07
-#define UAC_DELAY_CONTROL               0x08
-#define UAC_BASS_BOOST_CONTROL          0x09
-#define UAC_LOUDNESS_CONTROL            0x0a
-
-#define UAC_FU_MUTE             (1 << (UAC_MUTE_CONTROL - 1))
-#define UAC_FU_VOLUME           (1 << (UAC_VOLUME_CONTROL - 1))
-#define UAC_FU_BASS             (1 << (UAC_BASS_CONTROL - 1))
-#define UAC_FU_MID              (1 << (UAC_MID_CONTROL - 1))
-#define UAC_FU_TREBLE           (1 << (UAC_TREBLE_CONTROL - 1))
-#define UAC_FU_GRAPHIC_EQ       (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1))
-#define UAC_FU_AUTO_GAIN        (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1))
-#define UAC_FU_DELAY            (1 << (UAC_DELAY_CONTROL - 1))
-#define UAC_FU_BASS_BOOST       (1 << (UAC_BASS_BOOST_CONTROL - 1))
-#define UAC_FU_LOUDNESS         (1 << (UAC_LOUDNESS_CONTROL - 1))
-
 /* status word format (3.7.1.1) */
 
 #define UAC1_STATUS_TYPE_ORIG_MASK              0x0f