From patchwork Tue Oct 1 10:31:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_R=C3=83=C2=A9tornaz?= X-Patchwork-Id: 2969251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BDD93BFF0B for ; Tue, 1 Oct 2013 10:32:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B8AE2034D for ; Tue, 1 Oct 2013 10:32:22 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49D532024A for ; Tue, 1 Oct 2013 10:32:21 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxFI-0003Dc-Kg; Tue, 01 Oct 2013 10:32:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxFD-0004dF-Ml; Tue, 01 Oct 2013 10:31:55 +0000 Received: from slb-mail4.epfl.ch ([2001:620:618:1e0:1:80b2:e059:1] helo=smtp4.epfl.ch) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxF2-0004Zr-6c for linux-arm-kernel@lists.infradead.org; Tue, 01 Oct 2013 10:31:45 +0000 Received: (qmail 26555 invoked by uid 107); 1 Oct 2013 10:31:14 -0000 X-Virus-Scanned: ClamAV Received: from lsro1pc40.epfl.ch (HELO lsro1arena.8.8.4.4) (128.178.145.86) (authenticated) by smtp4.epfl.ch (AngelmatoPhylax SMTP proxy) with ESMTPSA; Tue, 01 Oct 2013 12:31:14 +0200 From: =?UTF-8?q?Philippe=20R=C3=A9tornaz?= To: vinod.koul@intel.com Subject: [PATCH 1/1] dma: imx-sdma: setup dma mask Date: Tue, 1 Oct 2013 12:31:04 +0200 Message-Id: <1380623464-24652-2-git-send-email-philippe.retornaz@epfl.ch> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380623464-24652-1-git-send-email-philippe.retornaz@epfl.ch> References: <1380623464-24652-1-git-send-email-philippe.retornaz@epfl.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131001_063144_577175_7D25551D X-CRM114-Status: GOOD ( 10.06 ) X-Spam-Score: -2.6 (--) Cc: fabio.estevam@freescale.com, =?UTF-8?q?Philippe=20R=C3=A9tornaz?= , s.hauer@pengutronix.de, shawn.guo@linaro.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The dma mask is not configured in the current code. This was triggered by soc-dmaengine-pcm which allocate the dma buffers with the imx-sdma as device. This commit fix audio on imx31. Signed-off-by: Philippe Rétornaz Acked-by: Sascha Hauer --- drivers/dma/imx-sdma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fc43603..c1fd504 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1432,6 +1432,10 @@ static int __init sdma_probe(struct platform_device *pdev) return -EINVAL; } + ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) + return ret; + sdma = kzalloc(sizeof(*sdma), GFP_KERNEL); if (!sdma) return -ENOMEM;