Merge branch 'topic/asoc' into for-linus

* topic/asoc: (226 commits)
  ASoC: au1x: PSC-AC97 bugfixes
  ASoC: Fix WM835x Out4 capture enumeration
  ASoC: Remove unuused hw_read_t
  ASoC: fix pxa2xx-ac97.c breakage
  ASoC: Fully specify DC servo bits to update in wm_hubs
  ASoC: Debugged improper setting of PLL fields in WM8580 driver
  ASoC: new board driver to connect bfin-5xx with ad1836 codec
  ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI
  ASoC: davinci: i2c device creation moved into board files
  ASoC: Don't reconfigure WM8350 FLL if not needed
  ASoC: Fix s3c-i2s-v2 build
  ASoC: Make platform data optional for TLV320AIC3x
  ASoC: Add S3C24xx dependencies for Simtec machines
  ASoC: SDP3430: Fix TWL GPIO6 pin mux request
  ASoC: S3C platform: Fix s3c2410_dma_started() called at improper time
  ARM: OMAP: McBSP: Merge two functions into omap_mcbsp_start/_stop
  ASoC: OMAP: Fix setup of XCCR and RCCR registers in McBSP DAI
  OMAP: McBSP: Use textual values in DMA operating mode sysfs files
  ARM: OMAP: DMA: Add support for DMA channel self linking on OMAP1510
  ASoC: Select core DMA when building for S3C64xx
  ...

diff --cc arch/arm/mach-omap2/mcbsp.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc include/linux/tty.h
Simple merge

diff --cc sound/soc/codecs/wm8988.c
index 8c0fdf8,1c86535..3f530f8
--- 1/sound/soc/codecs/wm8988.c
--- 2/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@@ -1036,10 -992,9 +992,9 @@@ static int __devinit wm8988_spi_probe(s
        codec->control_data = spi;
        codec->dev = &spi->dev;
  
 -      spi->dev.driver_data = wm8988;
 +      dev_set_drvdata(&spi->dev, wm8988);
  
-       return wm8988_register(wm8988);
+       return wm8988_register(wm8988, SND_SOC_SPI);
  }
  
  static int __devexit wm8988_spi_remove(struct spi_device *spi)