At Tue, 28 Apr 2009 20:25:45 +0100, Mark Brown wrote: > > On Tue, Apr 28, 2009 at 05:46:11PM +0200, Takashi Iwai wrote: > > > And, the jiffies check shall be anyway fixed in the upstream PCM core > > side, thus there is no big merit to hurry to merge the unfinished > > changes now. > > The refactoring is a largely orthogonal issue to the jiffies check - the > refactoring is needed to split the DMA code out so that it can be shared > with the AC97 driver John is writing. > > > So, could you back off mpc5200 changes and wait for a while until the > > issue regarding PCM jiffies-check is resolved? > > Done: Thanks, pulled now. Takashi > The following changes since commit 8a1f936acdfd53cb0a981f3f80483863dcd84fa9: > Peter Ujfalusi (1): > ASoC: TWL4030: Add 4 channel TDM support > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31 > > Daniel Mack (3): > ASoC: add SOC_DOUBLE_EXT macro > ASoC: cs4270: fix Master Capture Switch polarity > ASoC: cs4270: add Master Playback Switch > > Jon Smirl (1): > ASoC: Set the MPC5200 i2s driver to BROKEN status. > > Jonathan Cameron (1): > ASoC WM8940 Driver > > Joonyoung Shim (1): > ASoC: TWL4030: Fix gain control for earpiece amplifier > > Mark Brown (10): > ASoC: Fix S3C64xx IIS device registration and support both ports > ASoC: S3C2412: Failing to get the I2S clock is an error > ASoC: Enforce symmetric rates for S3C64xx I2S interface > ASoC: Include WM8350 register definitions in CODEC header > ASoC: s3c-i2s-v2 diagnostic improvements > ASoC: Use our registration function for S3C64xx > ASoC: Fix logic in WM8350 master clocking check > Merge branch 'for-2.6.30' into for-2.6.31 > ASoC: Staticise TLV values in WM8940 > Merge branch 'for-2.6.30' into for-2.6.31 > > Peter Ujfalusi (1): > ASoC: Beagle: Add support for 4 channel > > include/sound/soc.h | 8 + > sound/soc/codecs/Kconfig | 4 + > sound/soc/codecs/Makefile | 2 + > sound/soc/codecs/cs4270.c | 44 ++- > sound/soc/codecs/twl4030.c | 8 +- > sound/soc/codecs/wm8350.c | 2 +- > sound/soc/codecs/wm8350.h | 1 + > sound/soc/codecs/wm8940.c | 955 +++++++++++++++++++++++++++++++++++++++ > sound/soc/codecs/wm8940.h | 104 +++++ > sound/soc/fsl/Kconfig | 2 +- > sound/soc/omap/omap3beagle.c | 26 +- > sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- > sound/soc/s3c24xx/s3c64xx-i2s.c | 148 ++++-- > sound/soc/s3c24xx/s3c64xx-i2s.h | 2 +- > 14 files changed, 1241 insertions(+), 67 deletions(-) > create mode 100644 sound/soc/codecs/wm8940.c > create mode 100644 sound/soc/codecs/wm8940.h > _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
