From patchwork Wed Jun 25 10:53:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Popov X-Patchwork-Id: 4419501 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 877CE9F1D6 for ; Wed, 25 Jun 2014 10:53:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACD3D201CE for ; Wed, 25 Jun 2014 10:53:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F7F220395 for ; Wed, 25 Jun 2014 10:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755990AbaFYKxS (ORCPT ); Wed, 25 Jun 2014 06:53:18 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:55604 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752942AbaFYKxQ (ORCPT ); Wed, 25 Jun 2014 06:53:16 -0400 Received: by mail-la0-f50.google.com with SMTP id pv20so604145lab.37 for ; Wed, 25 Jun 2014 03:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=0Cirrj2dcERCLPuBYNamRrIrY+S88x9KNV8zLX7n6Hs=; b=VxilRWduDGdAmKPeuUa1iaS6a7sCExGPNLeHxoc7x+HIJkS0iaOoH0mNgmoU3u67wD o6qFS54/tXP7lzNOrxWFTU6CSD53MVVjSVjm/nXMzBVcKHjkfzwBxdzAUxyx9RXi9Z0b ailS30xXhnhlaAF3bmzaj+RFH0OtbzyiHQc0/SN2lZXetnwGYMIOKI89vAkCJnml2b5J 4rHx3xbfZ1t3R/BDAX2xnLA5LhbhamiORs6r97Ga5I+4kzKXGeX0C3DoBZtEh5ux1wvz 8ZnHcfMoJ6NAu77y1JktRaEiYq/P1Eg4jc63F9YDpWNyHTpjbp4VEkRA6diycc0jYjVK IJoA== X-Received: by 10.112.166.74 with SMTP id ze10mr290738lbb.94.1403693595216; Wed, 25 Jun 2014 03:53:15 -0700 (PDT) Received: from a13xCCC.localdomain (mail.tecon.ru. [89.175.104.62]) by mx.google.com with ESMTPSA id ll11sm1405442lac.48.2014.06.25.03.53.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 25 Jun 2014 03:53:14 -0700 (PDT) From: Alexander Popov To: Mark Rutland , Gerhard Sittig , Dan Williams , Vinod Koul , Lars-Peter Clausen , Arnd Bergmann , Anatolij Gustschin , Andy Shevchenko , Alexander Popov , linuxppc-dev@lists.ozlabs.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v3 3/3] dmaengine: mpc512x: register for device tree channel lookup Date: Wed, 25 Jun 2014 14:53:00 +0400 Message-Id: <1403693580-9449-4-git-send-email-a13xp0p0v88@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1403693580-9449-1-git-send-email-a13xp0p0v88@gmail.com> References: <1403693580-9449-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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 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: Alexander Popov --- arch/powerpc/boot/dts/mpc5121.dtsi | 1 + drivers/dma/mpc512x_dma.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 2ad4373..881db2b 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -1036,7 +1037,15 @@ static int mpc_dma_probe(struct platform_device *op) if (retval) goto err_free2; - return retval; + /* 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; err_free2: if (mdma->is_mpc8308) @@ -1057,6 +1066,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); if (mdma->is_mpc8308) { free_irq(mdma->irq2, mdma);