At Mon, 5 Apr 2010 19:44:40 +0100, Mark Brown wrote: > > The following changes since commit 2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d: > Mark Brown (1): > Merge branch 'for-2.6.34' into for-2.6.35 > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.35 > > The MFD updates for WM8994 are here because the only real consumer of > the interrupts on that device is the CODEC driver so it'd create cross > tree issues to try to merge the consumer side separately to the > controller; Samuel has acked the interrupt controller patch. Pulled now this, too. Thanks. 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 (9): > 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 > mfd: Add WM8994 interrupt controller support > gpiolib: Implement gpio_to_irq for WM8994 GPIO controller > ASoC: Implement interrupt based WM8994 microphone detection > Merge branch 'for-2.6.34' into for-2.6.35 > > Tejun Heo (1): > mfd: update gfp/slab.h includes > > drivers/gpio/wm8994-gpio.c | 12 ++ > drivers/mfd/Kconfig | 4 +- > drivers/mfd/Makefile | 2 +- > drivers/mfd/davinci_voicecodec.c | 1 + > drivers/mfd/wm8994-core.c | 43 +++++- > drivers/mfd/wm8994-irq.c | 310 ++++++++++++++++++++++++++++++++++++++ > include/linux/mfd/wm8994/core.h | 53 +++++++- > include/linux/mfd/wm8994/pdata.h | 1 + > include/sound/soc.h | 2 +- > sound/soc/codecs/wm8994.c | 193 ++++++++++++++++++++---- > sound/soc/codecs/wm8994.h | 3 + > sound/soc/codecs/wm_hubs.c | 83 ++++++---- > sound/soc/codecs/wm_hubs.h | 1 + > sound/soc/omap/omap-pcm.c | 17 +- > 14 files changed, 648 insertions(+), 77 deletions(-) > create mode 100644 drivers/mfd/wm8994-irq.c > _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel