From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap related MFD and ASoC patches for v3.1 merge window
Date: Mon, 11 Jul 2011 04:53:09 -0700 [thread overview]
Message-ID: <20110711115309.GA5783@atomide.com> (raw)
In-Reply-To: <20110711114736.GX5783@atomide.com>
The following changes since commit 727e18b429e3badda12d1de74f492bfa363a2e94:
Tony Lindgren (1):
Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-audio/linux-audio into cleanup-part-2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git twl-asoc
These depend on the cleanup-part-2 branch, so it was agreed with the MFD and ASoC
maintainers that they should get merged along with the other omap patches.
Axel Castaneda Gonzalez (1):
ASoC: twl6040: Configure ramp step based on platform
Liam Girdwood (3):
ASoC: twl6040: add all ABE DAIs
ASoC: twl6040: Support other sample rates in constraints.
ASoC: twl6040: set default constraints.
Misael Lopez Cruz (5):
mfd: twl6040: Add initial support
ASoC: twl6040: Convert into TWL6040 MFD child
input: Add initial support for TWL6040 vibrator
ASoC: twl6040: Remove pll and headset mode dependency
OMAP4: SDP4430: Add twl6040 codec platform support
Peter Ujfalusi (17):
MFD: twl4030-codec: Rename internals from codec to audio
MFD: twl4030-codec -> twl4030-audio: Rename the driver
MFD: twl4030-audio: Rename platform data
MFD: twl6040: Change platform data for soc codec driver
OMAP4: SDP4430: Add twl6040 vibrator platform support
MFD: twl6040: Use resource to provide irq number for slaves
input: twl6040-vibra: Do not use wrapper for irq request
ASoC: twl6040: Do not use wrapper for irq request
MFD: twl6040: Demand valid interrupt configuration
MFD: twl6040: Remove wrapper for threaded irq request
ASoC: twl6040: Use neutral name for power mode text/enum
ASoC: twl6040: Move PLL selection to codec driver
ASoC: twl6040: Simplify sample rate constraint handling
ASoC: twl6040: Configure PLL only once
MFD: twl6040: Remove enum for PLL tracking
ASoC: twl6040: No need to convert the PLL ID
ASoC: twl6040: Add back support for legacy mode
Tony Lindgren (1):
Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc
arch/arm/mach-omap2/board-4430sdp.c | 56 ++
arch/arm/mach-omap2/board-rx51-peripherals.c | 6 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 10 +-
arch/arm/mach-omap2/twl-common.c | 10 +-
arch/arm/plat-omap/include/plat/irqs.h | 12 +-
drivers/input/misc/Kconfig | 13 +-
drivers/input/misc/Makefile | 1 +
drivers/input/misc/twl4030-vibra.c | 12 +-
drivers/input/misc/twl6040-vibra.c | 423 +++++++++++
drivers/mfd/Kconfig | 8 +-
drivers/mfd/Makefile | 3 +-
drivers/mfd/twl-core.c | 13 +-
drivers/mfd/twl4030-audio.c | 277 ++++++++
drivers/mfd/twl4030-codec.c | 277 --------
drivers/mfd/twl6040-core.c | 620 +++++++++++++++++
drivers/mfd/twl6040-irq.c | 191 +++++
include/linux/i2c/twl.h | 25 +-
.../linux/mfd/{twl4030-codec.h => twl4030-audio.h} | 16 +-
include/linux/mfd/twl6040.h | 228 ++++++
sound/soc/codecs/Kconfig | 3 +-
sound/soc/codecs/twl4030.c | 22 +-
sound/soc/codecs/twl6040.c | 733 +++++++++-----------
sound/soc/codecs/twl6040.h | 119 +----
sound/soc/omap/sdp3430.c | 2 +-
sound/soc/omap/sdp4430.c | 52 +--
sound/soc/omap/zoom2.c | 2 +-
26 files changed, 2230 insertions(+), 904 deletions(-)
create mode 100644 drivers/input/misc/twl6040-vibra.c
create mode 100644 drivers/mfd/twl4030-audio.c
delete mode 100644 drivers/mfd/twl4030-codec.c
create mode 100644 drivers/mfd/twl6040-core.c
create mode 100644 drivers/mfd/twl6040-irq.c
rename include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%)
create mode 100644 include/linux/mfd/twl6040.h
next prev parent reply other threads:[~2011-07-11 11:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-11 11:47 Remaining omap pull requests Tony Lindgren
2011-07-11 11:53 ` Tony Lindgren [this message]
2011-07-11 22:16 ` Arnd Bergmann
2011-07-13 6:16 ` Tony Lindgren
2011-08-02 23:14 ` Kevin Hilman
2011-08-03 0:06 ` Kevin Hilman
2011-08-10 12:21 ` Tony Lindgren
2011-08-16 14:07 ` Arnd Bergmann
2011-07-12 8:41 ` Jan Weitzel
2011-07-13 6:25 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110711115309.GA5783@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).