From patchwork Wed Feb 6 06:18:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2102161 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 C712EE00C6 for ; Wed, 6 Feb 2013 06:21:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2yLR-0003f2-7m; Wed, 06 Feb 2013 06:18:57 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2yL4-0003at-L4 for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 06:18:36 +0000 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 <0MHS00ESTC6I63N0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 15:18:33 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id DA.2F.03880.9B5F1115; Wed, 06 Feb 2013 15:18:33 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-c6-5111f5b93ec5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 39.2F.03880.9B5F1115; Wed, 06 Feb 2013 15:18:33 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MHS001KWC6CC970@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 06 Feb 2013 15:18:33 +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 V3 4/5] ARM: dts: Add #dma-cells for generic dma binding support Date: Wed, 06 Feb 2013 11:48:48 +0530 Message-id: <1360131529-2847-5-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360131529-2847-1-git-send-email-padma.v@samsung.com> References: <1360131529-2847-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsWyRsSkRnfnV8FAg+ZWHYtNj6+xOjB6bF5S H8AYxWWTkpqTWZZapG+XwJVxfXVCwQ/xigW/ulkaGM8JdTFyckgImEjsWfWLBcIWk7hwbz1b FyMXh5DAUkaJG+/WscAUHXv4gB0isYhR4vLRU1DOViaJ+0cWsXYxcnCwCehItJx1AYmLCMxh lGjePoMRxGEW+Mko8aLvMSvIKGGBAIlH2zcxgtgsAqoSszb/YgexeQWcJI6cvMkGsU5B4tjU r2D1nALOEss6+sDqhYBqXq69zgoyVELgOpvE5X/P2SEGCUh8m3yIBeQKCQFZiU0HmCHmSEoc XHGDZQKj8AJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYgUF4+t8z6R2MqxosDjEKcDAq 8fDe0BMMFGJNLCuuzD3EKMHBrCTCa/sZKMSbklhZlVqUH19UmpNafIgxGWj5RGYp0eR8YITk lcQbGpuYmxqbWhoZmZmakiasJM7LeOpJgJBAemJJanZqakFqEcwWJg5OqQbGxk5Ljr338uIf Hrj4S6nV+3hHYtgV91kzr9rcnakxXWr5164D7idnTzuw4USj4+trd2xtW7p32mUm3Pv+PMN1 9yTjJueizBka5xZsr3F3/st1/f++J5OaN2/cMOdJtYbl41YG54VxtxZvbUuxvcHE5Ty9L2qS ErOKGqulmWHk2Zu7v01cs/NlthJLcUaioRZzUXEiAK5+ftWGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAd2dXwUDDQ5dk7TY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGddXJxT8EK9Y8KubpYHx nFAXIyeHhICJxLGHD9ghbDGJC/fWs3UxcnEICSxilLh89BQ7hLOVSeL+kUWsXYwcHGwCOhIt Z11A4iICcxglmrfPYARxmAV+Mkq86HvMCjJKWCBA4tH2TYwgNouAqsSszb/AVvAKOEkcOXmT DWKdgsSxqV/B6jkFnCWWdfSB1QsB1bxce511AiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6 yfm5mxjBIf5MegfjqgaLQ4wCHIxKPLw39AQDhVgTy4orcw8xSnAwK4nw2n4GCvGmJFZWpRbl xxeV5qQWH2JMBrpqIrOUaHI+MP7ySuINjU3MTY1NLU0sTMwsSRNWEudlPPUkQEggPbEkNTs1 tSC1CGYLEwenVAOjeFB7kumyP+szF7G38euxSi6ym5qW4vz/2g222lO8vxdXM95c9kbaR03z pZfqHKGWulWOovsSOjuNzRiv9Jzs+SbC3zdtw4GmaIH/+wLLYi8+VDrE8v8I516+H+cC2Hhf Xf5xskWsPT7/zy69E6c7mTof+y77qcG32OmZ8gq5o4KreKNNMm2UWIozEg21mIuKEwHVVbry tQIAAA== 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-20130206_011834_964161_740B6432 X-CRM114-Status: GOOD ( 11.21 ) 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>; }; };