From patchwork Fri Feb 1 12:51:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2079841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BDF21DFE75 for ; Fri, 1 Feb 2013 12:58:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U1G9Q-0004Zc-Bp; Fri, 01 Feb 2013 12:55:28 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U1G9L-0004Xe-D5 for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2013 12:55:24 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHJ00C5RL880DZ0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2013 21:55:22 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 82.6F.03918.A3BBB015; Fri, 01 Feb 2013 21:55:22 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-0e-510bbb3aacd2 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1E.5F.03918.93BBB015; Fri, 01 Feb 2013 21:55:21 +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 <0MHJ00DM6L1HSU70@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2013 21:55:21 +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 Subject: [PATCH V2 3/4] ARM: dts: Add #dma-cells for generic dma binding support Date: Fri, 01 Feb 2013 18:21:55 +0530 Message-id: <1359723116-18173-4-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1359723116-18173-1-git-send-email-padma.v@samsung.com> References: <1359723116-18173-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsWyRsSkTtdqN3egwfRZfBabHl9jdWD02Lyk PoAxissmJTUnsyy1SN8ugStj3q0vbAXnxStazl1maWBcJdTFyMkhIWAi0fr8IzuELSZx4d56 ti5GLg4hgaWMEo///maFKertWwtmCwlMZ5TYsaMWwt7KJHHpdE4XIwcHm4CORMtZF5BeEYE5 jBLN22cwgjjMAj8ZJV70PQZrFhYIkLhybz4TiM0ioCpx4VML2GZeAWeJvkmLoZYpSByb+hXM 5hRwkbj/fT4zxDJnieMT17ODDJUQuMwm8WjfcRaIQQIS3yYfYgG5QkJAVmLTAWaIOZISB1fc YJnAKLyAkWEVo2hqQXJBcVJ6rqFecWJucWleul5yfu4mRmAInv73TGoH48oGi0OMAhyMSjy8 Bd+5AoVYE8uKK3MPMUpwMCuJ8NrWcgcK8aYkVlalFuXHF5XmpBYfYkwGWj6RWUo0OR8YH3kl 8YbGJuamxqaWRkZmpqakCSuJ8zKeehIgJJCeWJKanZpakFoEs4WJg1OqgXGZ4PuXnc9THI/l 3zx+wET3rd/V71+5Xs6KEVseYbnjLneQ4IqvvRmyem51pxI9uqV45ArVyrU0Kt+49mgHh8wK d1hSvc1J+/ccY69ev7hftx49bzz+9liCAIvWu1UtP8oMlJNyDHTbqmKU05NeOeZVvzMx/1XV 9aSqtsyjTGjxtXevRCLuKLEUZyQaajEXFScCADcK7IaFAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQV3L3dyBBlv+WlpsenyN1YHRY/OS +gDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwhrGjHm3vrAVnBevaDl3maWB cZVQFyMnh4SAiURv31pWCFtM4sK99WwgtpDAdEaJHTtqIeytTBKXTud0MXJwsAnoSLScdeli 5OIQEZjDKNG8fQYjiMMs8JNR4kXfY7BBwgIBElfuzWcCsVkEVCUufGphB7F5BZwl+iYthlqm IHFs6lcwm1PAReL+9/nMEMucJY5PXM8+gZF3ASPDKkbR1ILkguKk9FxDveLE3OLSvHS95Pzc TYzgAH8mtYNxZYPFIUYBDkYlHt6C71yBQqyJZcWVuYcYJTiYlUR4bWu5A4V4UxIrq1KL8uOL SnNSiw8xJgNdNZFZSjQ5Hxh9eSXxhsYm5qbGppYmFiZmlqQJK4nzMp56EiAkkJ5YkpqdmlqQ WgSzhYmDU6qB0XpJ7oLgvL4ZGpZTlsht92y0uTAhOTr/1daDP5hNJ+w0bZ5h8eX6r4L8Gyos JlESjmnO8hZzTp1exZqpwnQtzYYj/UHX59+xrgqnQs89XVTTFzrDM2yB6FdH58rCGXb6x3dv 8pkm4BGpVD311i7ml5Y5au4Sjy+rbONlt11iYNnDUTAppaRBiaU4I9FQi7moOBEAWuMOYbQC AAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130201_075523_740332_3EDF1E8B X-CRM114-Status: GOOD ( 11.10 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: jassisinghbrar@gmail.com, kgene.kim@samsung.com, arnd@arndb.de, boojin.kim@samsung.com, sbkim73@samsung.com, broonie@opensource.wolfsonmicro.com, grant.likely@secretlab.ca, vinod.koul@intel.com, thomas.abraham@linaro.org, jon-hunter@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 | 15 +++++++++++---- arch/arm/boot/dts/exynos5250.dtsi | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/arm-pl330.txt b/Documentation/devicetree/bindings/dma/arm-pl330.txt index 36e27d5..1fdbff6 100644 --- a/Documentation/devicetree/bindings/dma/arm-pl330.txt +++ b/Documentation/devicetree/bindings/dma/arm-pl330.txt @@ -8,6 +8,8 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. - interrupts: interrupt number to the cpu. + - #dma-cells: must be <1>. used to represent the number of integer + cells in the dmas property of client device. Optional properties: - dma-coherent : Present if dma operations are coherent @@ -18,16 +20,21 @@ Example: compatible = "arm,pl330", "arm,primecell"; reg = <0x12680000 0x1000>; interrupts = <99>; + #dma-cells = <1>; }; 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 f50b4e8..724f5bd 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -312,24 +312,28 @@ compatible = "arm,pl330", "arm,primecell"; reg = <0x121A0000 0x1000>; interrupts = <0 34 0>; + #dma-cells = <1>; }; pdma1: pdma@121B0000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x121B0000 0x1000>; interrupts = <0 35 0>; + #dma-cells = <1>; }; mdma0: mdma@10800000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x10800000 0x1000>; interrupts = <0 33 0>; + #dma-cells = <1>; }; mdma1: mdma@11C10000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x11C10000 0x1000>; interrupts = <0 124 0>; + #dma-cells = <1>; }; };