From patchwork Thu Feb 14 03:40:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2140211 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CBD343FCFC for ; Thu, 14 Feb 2013 03:40:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699Ab3BNDkC (ORCPT ); Wed, 13 Feb 2013 22:40:02 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:21345 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754399Ab3BNDkB (ORCPT ); Wed, 13 Feb 2013 22:40:01 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI6005XPY61RK60@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 14 Feb 2013 12:39:55 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B2.50.03880.A8C5C115; Thu, 14 Feb 2013 12:39:55 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-3e-511c5c8a6a4c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 71.50.03880.A8C5C115; Thu, 14 Feb 2013 12:39:54 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MI600N0PY5X1F30@mmp2.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 14 Feb 2013 12:39:54 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, padma.v@samsung.com, padma.kvr@gmail.com Cc: sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, kgene.kim@samsung.com, jassisinghbrar@gmail.com, arnd@arndb.de, vinod.koul@intel.com, grant.likely@secretlab.ca, jon-hunter@ti.com, boojin.kim@samsung.com, thomas.abraham@linaro.org, robherring2@gmail.com Subject: [PATCH V4 4/4] ARM: dts: pl330: Add #dma-cells for generic dma binding support Date: Thu, 14 Feb 2013 09:10:08 +0530 Message-id: <1360813208-9498-5-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360813208-9498-1-git-send-email-padma.v@samsung.com> References: <1360813208-9498-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCLMWRmVeSWpSXmKPExsWyRsSkVrc7RibQ4MQkFosZ5/cxOTB6fN4k F8AYxWWTkpqTWZZapG+XwJWxaMkq5oIV0hXXey+yNjDOEu1i5OSQEDCRmNKzkQnCFpO4cG89 WxcjF4eQwFJGiav3NzHBFO3s+guVmM4oceH9fkYIZxOTxKIfG5m7GDk42AR0JFrOuoDERQTm MEo0b58BVsQsMIFJYuKi1ewgo4QFIiVunLkANpZFQFVi56mLrCA2r4CTRMf6GawQ6xQkjk39 CmZzCjhLnNpyGqxeCKjm3Y0uJpChEgLX2SSeP25ggxgkIPFt8iEWkCskBGQlNh1ghpgjKXFw xQ2WCYzCCxgZVjGKphYkFxQnpeca6RUn5haX5qXrJefnbmIEhuHpf8+kdzCuarA4xCjAwajE w6vwSzpQiDWxrLgy9xCjBAezkgjvy0CZQCHelMTKqtSi/Pii0pzU4kOMyUDLJzJLiSbnA2Mk ryTe0NjE3NTY1NLIyMzUlDRhJXFexlNPAoQE0hNLUrNTUwtSi2C2MHFwSjUw1lv8nZyhfuKX 1zmlZTGvp1axKWh0Kr2fsovd9W9N/uQbd0tsXv34eVPtpSBHxaMzG7qWpwk+KO0Nv+zOYrtw aUuLxraZC9itvd9/litxZKrWmbaB7UCc071Pb9/VCIbpmN2+6MBof81LZqf1S63Hf7r7TiVK /0vLeWmd4calr+739sKjB9+MlFiKMxINtZiLihMBADwyQocCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jQd2uGJlAg1MbTSxmnN/H5MDo8XmT XABjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxqIlq5gLVkhXXO+9yNrA OEu0i5GTQ0LARGJn1182CFtM4sK99UA2F4eQwHRGiQvv9zNCOJuYJBb92MjcxcjBwSagI9Fy 1gUkLiIwh1GiefsMsCJmgQlMEhMXrWYHGSUsEClx48wFJhCbRUBVYuepi6wgNq+Ak0TH+hms EOsUJI5N/Qpmcwo4S5zachqsXgio5t2NLqYJjLwLGBlWMYqmFiQXFCel5xrpFSfmFpfmpesl 5+duYgQH+TPpHYyrGiwOMQpwMCrx8Cr8kg4UYk0sK67MPcQowcGsJML7MlAmUIg3JbGyKrUo P76oNCe1+BBjMtBVE5mlRJPzgRGYVxJvaGxibmpsamliYWJmSZqwkjgv46knAUIC6Yklqdmp qQWpRTBbmDg4pRoYZRhNXhWWznk1lW/ayodpxQduRU1WPenJXuzmeXRh6o/LnrwvXlsEvHwt cHfrqTl3T65xmPrHqk1sbs8qk1VaYWxt6w9MiivYtSpNvyd8bv/OuON8q+ewWHxXC89hdnpV L/mz9ZfHjOrOaGNXH82X56yX/Nly7LDmnjTXa44b/iwI+RbtJBaZq8RSnJFoqMVcVJwIAEWP HSO2AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch adds #dma-cells property to PL330 DMA controller nodes for supporting generic dma dt bindings on samsung exynos5250 platform. Signed-off-by: Padmavathi Venna Acked-by: Arnd Bergmann --- .../devicetree/bindings/dma/arm-pl330.txt | 21 +++++++++++++++---- arch/arm/boot/dts/exynos5250.dtsi | 12 +++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/arm-pl330.txt b/Documentation/devicetree/bindings/dma/arm-pl330.txt index 36e27d5..2675658 100644 --- a/Documentation/devicetree/bindings/dma/arm-pl330.txt +++ b/Documentation/devicetree/bindings/dma/arm-pl330.txt @@ -10,7 +10,11 @@ Required properties: - interrupts: interrupt number to the cpu. Optional properties: -- dma-coherent : Present if dma operations are coherent + - dma-coherent : Present if dma operations are coherent + - #dma-cells: must be <1>. used to represent the number of integer + cells in the dmas property of client device. + - dma-channels: contains the total number of DMA channels supported by the DMAC + - dma-requests: contains the total number of DMA requests supported by the DMAC Example: @@ -18,16 +22,23 @@ Example: compatible = "arm,pl330", "arm,primecell"; reg = <0x12680000 0x1000>; interrupts = <99>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; Client drivers (device nodes requiring dma transfers from dev-to-mem or -mem-to-dev) should specify the DMA channel numbers using a two-value pair +mem-to-dev) should specify the DMA channel numbers and dma channel names as shown below. [property name] = <[phandle of the dma controller] [dma request id]>; + [property name] = <[dma channel name]> where 'dma request id' is the dma request number which is connected - to the client controller. The 'property name' is recommended to be - of the form -dma-channel. + to the client controller. The 'property name' 'dmas' and 'dma-names' + as required by the generic dma device tree binding helpers. The dma + names correspond 1:1 with the dma request ids in the dmas property. - Example: tx-dma-channel = <&pdma0 12>; + Example: dmas = <&pdma0 12 + &pdma1 11>; + dma-names = "tx", "rx"; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 2e3b6ef..c774aae 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -280,24 +280,36 @@ compatible = "arm,pl330", "arm,primecell"; reg = <0x121A0000 0x1000>; interrupts = <0 34 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; pdma1: pdma@121B0000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x121B0000 0x1000>; interrupts = <0 35 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; mdma0: mdma@10800000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x10800000 0x1000>; interrupts = <0 33 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <1>; }; mdma1: mdma@11C10000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x11C10000 0x1000>; interrupts = <0 124 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <1>; }; };