At Mon, 5 Apr 2010 19:38:40 +0100, Mark Brown wrote:

The following changes since commit fb48e3c6a4d8888aff61fbf567aadac7d206e973: Graham Gower (1): ASoC: Fix passing platform_data to ac97 bus users and fix a leak

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.34

This is rather large for a stable update due to the inclusion of Daniel's backported fix for corruption of DMA data due to use of dma_data by both capture and playback streams (which is large but straightforward) and my updates for WM8994, particularly DC servo handling. The WM8994 updates mostly affect that part (which was only introduced in 2.6.34) and are strongly recommended for all users, individually they are all relatively straightforward.

Thanks, pulled now.

Takashi

Daniel Mack (1): ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

Janusz Krzysztofik (1): ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code

Mark Brown (5): ASoC: Avoid wraparound in wm_hubs DC servo correction ASoC: Support second DC servo readback method for wm_hubs ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices ASoC: Only do WM8994 bias off transition from standby

include/sound/soc-dai.h | 18 ++++++++- include/sound/soc.h | 1 + sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 6 +- sound/soc/codecs/wm8994.c | 56 ++++++++++++++----------- sound/soc/codecs/wm_hubs.c | 83 ++++++++++++++++++++++-------------- sound/soc/codecs/wm_hubs.h | 1 + sound/soc/davinci/davinci-i2s.c | 3 +- sound/soc/davinci/davinci-mcasp.c | 3 +- sound/soc/davinci/davinci-pcm.c | 4 +- sound/soc/imx/imx-pcm-dma-mx2.c | 8 +++- sound/soc/imx/imx-ssi.c | 7 ++- sound/soc/omap/omap-mcbsp.c | 4 +- sound/soc/omap/omap-mcpdm.c | 3 +- sound/soc/omap/omap-pcm.c | 21 +++++---- sound/soc/pxa/pxa-ssp.c | 23 +++++----- sound/soc/pxa/pxa2xx-ac97.c | 17 +++++-- sound/soc/pxa/pxa2xx-i2s.c | 7 ++- sound/soc/pxa/pxa2xx-pcm.c | 4 +- sound/soc/s3c24xx/s3c-ac97.c | 21 +++++---- sound/soc/s3c24xx/s3c-dma.c | 4 +- sound/soc/s3c24xx/s3c-i2s-v2.c | 13 ++++-- sound/soc/s3c24xx/s3c-pcm.c | 7 ++- sound/soc/s3c24xx/s3c24xx-i2s.c | 19 ++++---- sound/soc/s6000/s6000-i2s.c | 3 +- sound/soc/s6000/s6000-pcm.c | 40 +++++++++++++----- 26 files changed, 240 insertions(+), 138 deletions(-)