Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

1 files changed, 26 insertions, 13 deletions

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 060dccb9ec75..7f78c6d782b0 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -31,6 +31,7 @@
 #include "card.h"
 #include "endpoint.h"
 #include "pcm.h"
+#include "quirks.h"
 
 #define EP_FLAG_ACTIVATED       0
 #define EP_FLAG_RUNNING         1
@@ -170,6 +171,11 @@ static void retire_inbound_urb(struct snd_usb_endpoint *ep,
 {
         struct urb *urb = urb_ctx->urb;
 
+        if (unlikely(ep->skip_packets > 0)) {
+                ep->skip_packets--;
+                return;
+        }
+
         if (ep->sync_slave)
                 snd_usb_handle_sync_urb(ep->sync_slave, ep, urb);
 
@@ -567,20 +573,19 @@ static void release_urbs(struct snd_usb_endpoint *ep, int force)
  * configure a data endpoint
  */
 static int data_ep_set_params(struct snd_usb_endpoint *ep,
-                              struct snd_pcm_hw_params *hw_params,
+                              snd_pcm_format_t pcm_format,
+                              unsigned int channels,
+                              unsigned int period_bytes,
                               struct audioformat *fmt,
                               struct snd_usb_endpoint *sync_ep)
 {
         unsigned int maxsize, i, urb_packs, total_packs, packs_per_ms;
-        int period_bytes = params_period_bytes(hw_params);
-        int format = params_format(hw_params);
         int is_playback = usb_pipeout(ep->pipe);
-        int frame_bits = snd_pcm_format_physical_width(params_format(hw_params)) *
-                                                        params_channels(hw_params);
+        int frame_bits = snd_pcm_format_physical_width(pcm_format) * channels;
 
         ep->datainterval = fmt->datainterval;
         ep->stride = frame_bits >> 3;
-        ep->silence_value = format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0;
+        ep->silence_value = pcm_format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0;
 
         /* calculate max. frequency */
         if (ep->maxpacksize) {
@@ -693,7 +698,6 @@ out_of_memory:
  * configure a sync endpoint
  */
 static int sync_ep_set_params(struct snd_usb_endpoint *ep,
-                              struct snd_pcm_hw_params *hw_params,
                               struct audioformat *fmt)
 {
         int i;
@@ -736,7 +740,10 @@ out_of_memory:
  * snd_usb_endpoint_set_params: configure an snd_usb_endpoint
  *
  * @ep: the snd_usb_endpoint to configure
- * @hw_params: the hardware parameters
+ * @pcm_format: the audio fomat.
+ * @channels: the number of audio channels.
+ * @period_bytes: the number of bytes in one alsa period.
+ * @rate: the frame rate.
  * @fmt: the USB audio format information
  * @sync_ep: the sync endpoint to use, if any
  *
@@ -745,7 +752,10 @@ out_of_memory:
  * An endpoint that is already running can not be reconfigured.
  */
 int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
-                                struct snd_pcm_hw_params *hw_params,
+                                snd_pcm_format_t pcm_format,
+                                unsigned int channels,
+                                unsigned int period_bytes,
+                                unsigned int rate,
                                 struct audioformat *fmt,
                                 struct snd_usb_endpoint *sync_ep)
 {
@@ -765,9 +775,9 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
         ep->fill_max = !!(fmt->attributes & UAC_EP_CS_ATTR_FILL_MAX);
 
         if (snd_usb_get_speed(ep->chip->dev) == USB_SPEED_FULL)
-                ep->freqn = get_usb_full_speed_rate(params_rate(hw_params));
+                ep->freqn = get_usb_full_speed_rate(rate);
         else
-                ep->freqn = get_usb_high_speed_rate(params_rate(hw_params));
+                ep->freqn = get_usb_high_speed_rate(rate);
 
         /* calculate the frequency in 16.16 format */
         ep->freqm = ep->freqn;
@@ -777,10 +787,11 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
 
         switch (ep->type) {
         case  SND_USB_ENDPOINT_TYPE_DATA:
-                err = data_ep_set_params(ep, hw_params, fmt, sync_ep);
+                err = data_ep_set_params(ep, pcm_format, channels,
+                                         period_bytes, fmt, sync_ep);
                 break;
         case  SND_USB_ENDPOINT_TYPE_SYNC:
-                err = sync_ep_set_params(ep, hw_params, fmt);
+                err = sync_ep_set_params(ep, fmt);
                 break;
         default:
                 err = -EINVAL;
@@ -828,6 +839,8 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep)
         ep->unlink_mask = 0;
         ep->phase = 0;
 
+        snd_usb_endpoint_start_quirk(ep);
+
         /*
          * If this endpoint has a data endpoint as implicit feedback source,
          * don't start the urbs here. Instead, mark them all as available,