From patchwork Thu Mar 20 14:47:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Popov X-Patchwork-Id: 332214 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 21F7A2C00E7 for ; Fri, 21 Mar 2014 01:52:24 +1100 (EST) Received: from mail-la0-x235.google.com (mail-la0-x235.google.com [IPv6:2a00:1450:4010:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 06BA22C0143 for ; Fri, 21 Mar 2014 01:48:28 +1100 (EST) Received: by mail-la0-f53.google.com with SMTP id b8so685248lan.26 for ; Thu, 20 Mar 2014 07:48:24 -0700 (PDT) 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=rXHGYEVNtypLHV5L7NZUfv/WHkbEGPd2kSIH1sAY3PE=; b=WGayMDTMcJ78BtbGc8RXhAtQj5RdFBt0EwVvbhbiIP40OUff2NjPrvCyNt6iLvQ84R bPQt7IP/QAC1JyHEhId3uMv1XxHdjbPI0c1W4aY38wrLjgRDn6cPawokq8n3LiWVBs6f UhptIIB0Kon4D56Ket6S391jtj/ng/xbLv0pCVZeci48ZIv77FDAlhE2Uk7qn2VohXkz JrjckyyYnYqH0lfLCkhrTT5bXlhLsF2CW1zlg4VmjmJ1d8SxAoqzua8lUt/AtrRqN3NP mG5DVOqGt8DszK+3BAGziP9TG517R8MEkOKXlzira7xsvU7wEkOpzlyq9w+CYmsg3KY4 aU7Q== X-Received: by 10.152.218.103 with SMTP id pf7mr1934660lac.40.1395326904443; Thu, 20 Mar 2014 07:48:24 -0700 (PDT) Received: from a13xCCC.localdomain (mail.tecon.ru. [89.175.104.62]) by mx.google.com with ESMTPSA id qa7sm1398967lbb.6.2014.03.20.07.48.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Mar 2014 07:48:23 -0700 (PDT) From: Alexander Popov To: 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 Subject: [PATCH RFC v10 6/6] dma: mpc512x: register for device tree channel lookup Date: Thu, 20 Mar 2014 18:47:58 +0400 Message-Id: <1395326878-25243-7-git-send-email-a13xp0p0v88@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1395326878-25243-1-git-send-email-a13xp0p0v88@gmail.com> References: <1395326878-25243-1-git-send-email-a13xp0p0v88@gmail.com> Cc: devicetree@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 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 1b90b3b..ab70012 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -1031,7 +1032,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) @@ -1052,6 +1061,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);