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

Pull sound updates from Takashi Iwai:
 "Mostly many small changes spread as seen in diffstat in sound/*
  directory by this update.  A significant change in the subsystem level
  is the introduction of snd_soc_component, which will help more generic
  handling of SoC and off-SoC components.

  Also, snd_BUG_ON() macro is enabled unconditionally now due to its
  misuses, so people might hit kernel warnings (it's a good thing for
  us).

   - compress-offload: support for capture by Charles Keepax
   - HD-audio: codec delay support by Dylan Reid
   - HD-audio: improvements/fixes in generic parser: better headphone
     mic and headset mic support, jack_modes hint consolidation, proper
     beep attach/detachment, generalized power filter controls by David
     Henningsson, et al
   - HD-audio: Improved management of HDMI codec pins/converters
   - HD-audio: Better pin/DAC assignment for VIA codecs
   - HD-audio: Haswell HDMI workarounds
   - HD-audio: ALC268 codec support, a few new quirks for Chromebooks
   - USB: regression fixes: USB-MIDI autopm fix, the recent ISO latency
     fix by Clemens Ladisch
   - USB: support for DSD formats by Daniel Mack
   - USB: A few UAC2 device endian/cock fixes by Eldad Zack
   - USB: quirks for Emu 192kHz support, Novation Twitch DJ controller,
     Yamaha THRxx devices
   - HDSPM: updates for TCO controls by Adrian Knoth
   - ASoC: Add a snd_soc_component object type for generic handling of
     SoC and off-SoC components by Kuninori Morimoto,
   - dmaengine: a large set of cleanups and conversions by Lars-Peter
     Clausen
   - ASoC DAPM: performance optimizations from Ryo Tsutsui
   - ASoC DAPM: support for mixer control sharing by Stephen Warren
   - ASoC: multiplatform ARM cleanups from Arnd Bergmann
   - ASoC: new codec drivers for AK5385 and TAS5086 from Daniel Mack"

* tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (315 commits)
  ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch
  ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats
  ALSA: pcm_format_to_bits strong-typed conversion
  ALSA: compress: fix the states to check for allowing read
  ALSA: hda - Move Thinkpad X220 to use auto parser
  ALSA: USB: adjust for changed 3.8 USB API
  ALSA: usb - Avoid unnecessary sample rate changes on USB 2.0 clock sources
  sound: oss/dmabuf: use dma_map_single
  ALSA: ali5451: use mdelay instead of large udelay constants
  ALSA: hda - Add the support for ALC286 codec
  ALSA: usb-audio: USB quirk for Yamaha THR10C
  ALSA: usb-audio: USB quirk for Yamaha THR5A
  ALSA: usb-audio: USB quirk for Yamaha THR10
  ALSA: usb-audio: Fix autopm error during probing
  ALSA: snd-usb: try harder to find USB_DT_CS_ENDPOINT
  ALSA: sound kconfig typo
  ALSA: emu10k1: Fix dock firmware loading
  ASoC: ux500: forward declare msp_i2s_platform_data
  ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes
  ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers
  ...

diff --cc arch/arm/mach-s3c24xx/dma-s3c2410.c
index a6c94b820954a55f016cb4e388c9889d97d4fbf8,a4a13c99083bf6f518e8093883d368088d566684..30aa53ff07a6b60118a512a65bb387216194ac93
--- 1/arch/arm/mach-s3c24xx/dma-s3c2410.c
--- 2/arch/arm/mach-s3c24xx/dma-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2410.c
@@@ -25,10 -25,9 +25,8 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
  #include <plat/regs-dma.h>
  #include <mach/regs-lcd.h>
- #include <plat/regs-iis.h>
 -#include <mach/regs-sdi.h>
  #include <plat/regs-spi.h>
  
  static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {

diff --cc arch/arm/mach-s3c24xx/dma-s3c2412.c
index c0e8c3f5057ef98ce0bfb1557a5a2f200894380e,6eaa7a4991f829891269c7ffe0b2b4d05ce994c7..ab1700ec8e64f9cf3870179b4d2d2afc733e5d60
--- 1/arch/arm/mach-s3c24xx/dma-s3c2412.c
--- 2/arch/arm/mach-s3c24xx/dma-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2412.c
@@@ -25,10 -25,9 +25,8 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
  #include <plat/regs-dma.h>
  #include <mach/regs-lcd.h>
- #include <plat/regs-iis.h>
 -#include <mach/regs-sdi.h>
  #include <plat/regs-spi.h>
  
  #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }

diff --cc arch/arm/mach-s3c24xx/dma-s3c2440.c
index 1c08eccd9425c12007a2c0a7db4ba8a9e48b65e6,477d4501967fa5dc1b4c1c3277085d21c55211ab..cd25de28804c935111da58ff97708e56a20d8238
--- 1/arch/arm/mach-s3c24xx/dma-s3c2440.c
--- 2/arch/arm/mach-s3c24xx/dma-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2440.c
@@@ -25,10 -25,9 +25,8 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
  #include <plat/regs-dma.h>
  #include <mach/regs-lcd.h>
- #include <plat/regs-iis.h>
 -#include <mach/regs-sdi.h>
  #include <plat/regs-spi.h>
  
  static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {

diff --cc arch/arm/mach-s3c24xx/dma-s3c2443.c
index 000e4c69fce9ad3f92b8adc414e1299abbda1cca,80a8d56e2559be11c64a484df4a8cf8cceec5cc8..5fe3539dc2b5a097ab46c7712b63b96344d86378
--- 1/arch/arm/mach-s3c24xx/dma-s3c2443.c
--- 2/arch/arm/mach-s3c24xx/dma-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c
@@@ -25,10 -25,9 +25,8 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <plat/regs-ac97.h>
  #include <plat/regs-dma.h>
  #include <mach/regs-lcd.h>
- #include <plat/regs-iis.h>
 -#include <mach/regs-sdi.h>
  #include <plat/regs-spi.h>
  
  #define MAP(x) { \

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/mfd/wm5102-tables.c
Simple merge

diff --cc include/linux/mfd/arizona/registers.h
Simple merge

diff --cc include/sound/pcm.h
Simple merge

diff --cc sound/core/info.c
Simple merge

diff --cc sound/soc/mxs/mxs-saif.c
Simple merge

diff --cc sound/soc/ux500/Kconfig
Simple merge

diff --cc sound/soc/ux500/ux500_msp_dai.c
Simple merge

diff --cc sound/soc/ux500/ux500_msp_i2s.h
Simple merge