| Submitter | Tony Lindgren |
|---|---|
| Date | July 11, 2011, 11:53 a.m. |
| Message ID | <20110711115309.GA5783@atomide.com> |
| Download | mbox |
| Permalink | /patch/104199/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E38AAB6F83 for <incoming-imx@patchwork.ozlabs.org>; Mon, 11 Jul 2011 21:53:23 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QgF37-0001v0-0r; Mon, 11 Jul 2011 11:53:17 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QgF36-0002dU-L8; Mon, 11 Jul 2011 11:53:16 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QgF33-0002dA-W8 for linux-arm-kernel@lists.infradead.org; Mon, 11 Jul 2011 11:53:14 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from <tony@atomide.com>) id 1QgF32-0005ZP-Gu; Mon, 11 Jul 2011 11:53:12 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/am88YHV/FUvX/vUbv1tPF Date: Mon, 11 Jul 2011 04:53:09 -0700 From: Tony Lindgren <tony@atomide.com> To: Arnd Bergmann <arnd@arndb.de> Subject: [GIT PULL] omap related MFD and ASoC patches for v3.1 merge window Message-ID: <20110711115309.GA5783@atomide.com> References: <20110711114736.GX5783@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110711114736.GX5783@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110711_075314_112280_C500C79E X-CRM114-Status: GOOD ( 14.05 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: Thomas Gleixner <tglx@linutronix.de>, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Pitre <nico@fluxnic.net> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org |
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