[alsa-devel] ASoC updates for 2.6.32

[Takashi Iwai]

At Thu, 25 Jun 2009 11:21:44 +0100,
Mark Brown wrote:
> 
> The following changes since commit 28d0325ce6e0a52f53d8af687e6427fee59004d3:
>   Linus Torvalds (1):
>         Linux 2.6.31-rc1
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32

You don't need to merge my branch now onto yours.  Instead, I'll merge
your branch first.  In that way without back-merging the upstream, the
history will be more straightforward.  That's what I learned
recently.

Could you take your branch back before merging the upstream?
Then I'll merge yours, and you can go forward cleanly after that.


thanks,

Takashi

> 
> Barry Song (1):
>       ASoC: Blackfin: convert internal names from bf52x to bf5xx
> 
> Daniel Ribeiro (2):
>       ASoC: Allow 32 bit registers for DAPM
>       ASoC: remove duplicated code on pxa-ssp.c
> 
> Lopez Cruz, Misael (4):
>       ASoC: Zoom2: Add machine driver for Zoom2 board
>       ASoC: TWL4030: Fix voice interface clock masters
>       ASoC: TWL4030: Add AVADC Clock Priority
>       ASoC: TWL4030: Correct bypass event for voice sidetone
> 
> Mark Brown (20):
>       ASoC: Sort DAPM power sequences while building lists
>       ASoC: Factor out DAPM sequence execution
>       ASoC: Coalesce register writes for DAPM sequences
>       ASoC: Sort specialised mixers and muxes together
>       ASoC: Coalesce power updates for DAPM widgets with events
>       ASoC: Coalesce power updates for PGAs
>       ASoC: Make DAPM power sequence lists local variables
>       Merge branch 'dapm' into for-2.6.32
>       ASoC: Add WM8961 driver
>       ASoC: Automatically control WM8903 sloping stopband filter
>       ASoC: Automatically manage WM8900 sloping stopband filter
>       ASoC: Automatically manage WM8350 sloping stopband filter
>       ASoC: Add stub suspend and resume calls for ASoC subdevices
>       ASoC: Add suspend and resume callbacks to Wolfson CODEC drivers
>       ASoC: Regulator support for WM8580
>       ASoC: Fix shadowed variables in twl4030
>       ASoC: Staticise put_twl4030_opmode_enum_double()
>       Merge branch 'wm8961' into for-2.6.32
>       ASoC: Add a shutdown callback
>       Merge branch 'topic/asoc' of git://git.kernel.org/.../tiwai/sound-2.6 into for-2.6.32
> 
> Philipp Zabel (1):
>       ASoC: UDA1380: refactor device registration
> 
>  include/sound/soc-dapm.h           |    1 +
>  include/sound/soc.h                |   11 +-
>  include/sound/uda1380.h            |   22 +
>  sound/soc/blackfin/bf5xx-ad73311.c |   16 +-
>  sound/soc/blackfin/bf5xx-ssm2602.c |   16 +-
>  sound/soc/codecs/Kconfig           |    4 +
>  sound/soc/codecs/Makefile          |    2 +
>  sound/soc/codecs/twl4030.c         |   38 +-
>  sound/soc/codecs/uda1380.c         |  313 +++++----
>  sound/soc/codecs/uda1380.h         |    8 -
>  sound/soc/codecs/wm8350.c          |   40 +-
>  sound/soc/codecs/wm8400.c          |   17 +
>  sound/soc/codecs/wm8580.c          |   55 ++-
>  sound/soc/codecs/wm8731.c          |   39 ++
>  sound/soc/codecs/wm8753.c          |   35 +
>  sound/soc/codecs/wm8900.c          |   30 +-
>  sound/soc/codecs/wm8903.c          |   27 +-
>  sound/soc/codecs/wm8940.c          |   17 +
>  sound/soc/codecs/wm8960.c          |   17 +
>  sound/soc/codecs/wm8961.c          | 1309 ++++++++++++++++++++++++++++++++++++
>  sound/soc/codecs/wm8961.h          |  866 ++++++++++++++++++++++++
>  sound/soc/codecs/wm8988.c          |   34 +
>  sound/soc/codecs/wm9081.c          |   17 +
>  sound/soc/omap/Kconfig             |    7 +
>  sound/soc/omap/Makefile            |    2 +
>  sound/soc/omap/sdp3430.c           |    2 +-
>  sound/soc/omap/zoom2.c             |  301 +++++++++
>  sound/soc/pxa/magician.c           |   54 +-
>  sound/soc/pxa/pxa-ssp.c            |   50 +-
>  sound/soc/soc-core.c               |   83 ++-
>  sound/soc/soc-dapm.c               |  347 ++++++++---
>  31 files changed, 3428 insertions(+), 352 deletions(-)
>  create mode 100644 include/sound/uda1380.h
>  create mode 100644 sound/soc/codecs/wm8961.c
>  create mode 100644 sound/soc/codecs/wm8961.h
>  create mode 100644 sound/soc/omap/zoom2.c
>