From patchwork Mon Feb 24 11:09:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Popov X-Patchwork-Id: 3708651 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 12F469F2ED for ; Mon, 24 Feb 2014 11:09:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C2C02013A for ; Mon, 24 Feb 2014 11:09:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 429C62013D for ; Mon, 24 Feb 2014 11:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752276AbaBXLJy (ORCPT ); Mon, 24 Feb 2014 06:09:54 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:36658 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175AbaBXLJx (ORCPT ); Mon, 24 Feb 2014 06:09:53 -0500 Received: by mail-la0-f46.google.com with SMTP id b8so5410843lan.5 for ; Mon, 24 Feb 2014 03:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DU+zhEr2qkQKLcX38FSYRgOYH6psreg7A4BDGqSdrtY=; b=r9VpqVeSdjewuE5D4Wqth2E4GvAd+BBKqOT/wzNy3lnozkqz+Cz59fY/aT90YLv1fK +LvDeRxn0CjgovCf9b+2vAWo2paA4UAzMF3Z2aJLvmXlAVuZt4Hg8VIkEikPCcRDJVIb hbn9R/05foBB2p3N6sBjOOQP+BkRXnjN7lXJd/e5+RmAJvYY+BLduGkCuHFylAcRpGvk t+ym0btdYzPrdquxrALs8aro7zHq9ns4b2NjFRdugCRCMNoIMScIxq2CskwhHjtvtM0Y omZUX6tTnrPd91z8XopyrB1bdYrtFcLYh0dWvFA5NBIhDQVYrQtXO5ZWYMK1dT9fv+f5 3Hsg== X-Received: by 10.112.138.10 with SMTP id qm10mr2628572lbb.19.1393240192254; Mon, 24 Feb 2014 03:09:52 -0800 (PST) Received: from a13xCCC.localdomain (mail.tecon.ru. [89.175.104.62]) by mx.google.com with ESMTPSA id gb8sm18245648lbc.13.2014.02.24.03.09.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Feb 2014 03:09:51 -0800 (PST) From: Alexander Popov To: Gerhard Sittig , Dan Williams , Vinod Koul , Lars-Peter Clausen , Arnd Bergmann , Anatolij Gustschin , Alexander Popov , linuxppc-dev@lists.ozlabs.org, dmaengine@vger.kernel.org Cc: devicetree@vger.kernel.org Subject: [PATCH RFC v8 5/5] dma: mpc512x: register for device tree channel lookup Date: Mon, 24 Feb 2014 15:09:32 +0400 Message-Id: <1393240172-18769-6-git-send-email-a13xp0p0v88@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1393240172-18769-1-git-send-email-a13xp0p0v88@gmail.com> References: <1393240172-18769-1-git-send-email-a13xp0p0v88@gmail.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Gerhard Sittig register the controller for device tree based lookup of DMA channels (non-fatal for backwards compatibility with older device trees) and provide the '#dma-cells' property in the shared mpc5121.dtsi file Signed-off-by: Gerhard Sittig [ a13xp0p0v88@gmail.com: resolve little patch conflict and put MPC512x DMA controller bindings document to a separate patch ] --- arch/powerpc/boot/dts/mpc5121.dtsi | 1 + drivers/dma/mpc512x_dma.c | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi index 2c0e155..7f9d14f 100644 --- a/arch/powerpc/boot/dts/mpc5121.dtsi +++ b/arch/powerpc/boot/dts/mpc5121.dtsi @@ -498,6 +498,7 @@ compatible = "fsl,mpc5121-dma"; reg = <0x14000 0x1800>; interrupts = <65 0x8>; + #dma-cells = <1>; }; }; diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 8f504cb..d9f8740 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -1018,11 +1019,23 @@ static int mpc_dma_probe(struct platform_device *op) /* Register DMA engine */ dev_set_drvdata(dev, mdma); retval = dma_async_device_register(dma); - if (retval) { - devm_free_irq(dev, mdma->irq, mdma); - irq_dispose_mapping(mdma->irq); + if (retval) + goto out_irq; + + /* register with OF helpers for DMA lookups (nonfatal) */ + if (dev->of_node) { + retval = of_dma_controller_register(dev->of_node, + of_dma_xlate_by_chan_id, + mdma); + if (retval) + dev_warn(dev, "could not register for OF lookup\n"); } + return 0; + +out_irq: + devm_free_irq(dev, mdma->irq, mdma); + irq_dispose_mapping(mdma->irq); return retval; } @@ -1031,6 +1044,8 @@ static int mpc_dma_remove(struct platform_device *op) struct device *dev = &op->dev; struct mpc_dma *mdma = dev_get_drvdata(dev); + if (dev->of_node) + of_dma_controller_free(dev->of_node); dma_async_device_unregister(&mdma->dma); devm_free_irq(dev, mdma->irq, mdma); irq_dispose_mapping(mdma->irq);