From patchwork Mon Dec 16 22:10:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 301891 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB28D2C007B for ; Tue, 17 Dec 2013 09:10:56 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsgNE-0001eO-GS; Mon, 16 Dec 2013 22:10:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsgNC-0008F6-06; Mon, 16 Dec 2013 22:10:46 +0000 Received: from avon.wwwdotorg.org ([70.85.31.133]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsgN7-0008Bj-UR for linux-arm-kernel@lists.infradead.org; Mon, 16 Dec 2013 22:10:43 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 869D36446; Mon, 16 Dec 2013 15:10:21 -0700 (MST) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id F3B08E463C; Mon, 16 Dec 2013 15:10:04 -0700 (MST) From: Stephen Warren To: arm@kernel.org Subject: [GIT PULL 02/10] ARM: tegra: dependency from the ASoC tree Date: Mon, 16 Dec 2013 15:10:04 -0700 Message-Id: <1387231812-5701-2-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1387231812-5701-1-git-send-email-swarren@wwwdotorg.org> References: <1387231812-5701-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.8 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_171042_088500_65F447F1 X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-tegra@vger.kernel.org, Mark Brown , Liam Girdwood , linux-arm-kernel@lists.infradead.org, Stephen Warren X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This is the work so far on dmaengine for v3.14, it is being cross merged into the Tegra tree to support a large DMA overhaul there. The main additions are a change in the DMA request API which allows better interaction at system startup using deferred probes and methods for overriding the default device and channel names used to request DMA. Cc: Liam Girdwood Cc: Mark Brown ---------------------------------------------------------------- The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae: Linux 3.13-rc1 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-dma-v3.14 or: git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git asoc-dma-v3.14 for you to fetch changes up to e9036c2a60f368b8ddc349fbbcde918ed32ab597: ASoC: dmaengine: fix deferred probe detection ---------------------------------------------------------------- Lars-Peter Clausen (2): ASoC: Add resource managed snd_dmaengine_pcm_register() ASoC: generic-dmaengine-pcm: Set BATCH flag when residue reporting is not supported Mark Brown (2): Merge remote-tracking branch 'asoc/fix/dma' into asoc-dma Merge branch 'topic/defer_probe' of git://git.infradead.org/users/vkoul/slave-dma into asoc-dma Stephen Warren (6): ASoC: restructure dmaengine_pcm_request_chan_of() ASoC: don't leak on error in snd_dmaengine_pcm_register ASoC: dmaengine: add custom DMA config to snd_dmaengine_pcm_config dma: add channel request API that supports deferred probe ASoC: dmaengine: support deferred probe for DMA channels ASoC: dmaengine: fix deferred probe detection drivers/dma/dmaengine.c | 35 +++++++++-- drivers/dma/of-dma.c | 15 +++-- include/linux/dmaengine.h | 8 +++ include/sound/dmaengine_pcm.h | 10 ++++ sound/soc/soc-devres.c | 41 +++++++++++++ sound/soc/soc-generic-dmaengine-pcm.c | 94 +++++++++++++++++++++++------- 6 files changed, 171 insertions(+), 32 deletions(-)