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: 2079771 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 082CF40E3D for ; Fri, 1 Feb 2013 12:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756140Ab3BAMza (ORCPT ); Fri, 1 Feb 2013 07:55:30 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:36057 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755883Ab3BAMzX (ORCPT ); Fri, 1 Feb 2013 07:55:23 -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 <0MHJ00GBKL884WW0@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 01 Feb 2013 21:55:22 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 6D.2D.03880.A3BBB015; Fri, 01 Feb 2013 21:55:22 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-21-510bbb3a4ee0 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id CA.2D.03880.93BBB015; Fri, 01 Feb 2013 21:55:22 +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-samsung-soc@vger.kernel.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 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 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+NgFvrMLMWRmVeSWpSXmKPExsWyRsSkRtdqN3egwc4rEhYzzu9jcmD0+LxJ LoAxissmJTUnsyy1SN8ugStj3q0vbAXnxStazl1maWBcJdTFyMkhIWAicfzCMzYIW0ziwr31 YLaQwFJGiUvHxWBqpp6dx9rFyAUUn84o0XXjPguEs4lJ4svUTqAMBwebgI5Ey1kXkLiIwBxG iebtMxhBHGaBn4wSL/oes4KMEhYIkLhybz4TiM0ioCpx4VMLO4jNK+As0TdpMSvEOgWJY1O/ gtmcAi4S97/PZ4Y4yVni+MT17CBDJQSus0msOH6FGWKQgMS3yYdYQK6QEJCV2HSAGWKOpMTB FTdYJjAKL2BkWMUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRGISn/z2T3sG4qsHiEKMAB6MS D++Jn1yBQqyJZcWVuYcYJTiYlUR4bWu5A4V4UxIrq1KL8uOLSnNSiw8xJgMtn8gsJZqcD4yQ vJJ4Q2MTc1NjU0sjIzNTU9KElcR5GU89CRASSE8sSc1OTS1ILYLZwsTBKdXAuLL5N3csq9Qa 5rLtc4xbUr/0JC96tegAj/0Ko2CnXTdva86Omnn6/D2eB8VXVK8xZ/6INUheq/dCI6fx+lP9 H2HePT5PFkyZeyb39O7k4kah+Ad5JznDn+Zd5+QpY8qX9IxaxsEkU10b17rSOkTp2ZGUVsmY CZfWK91e37Nvt1HNl+aDR0wPKLEUZyQaajEXFScCAHjWci+GAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jQV2r3dyBBhc/MFnMOL+PyYHR4/Mm uQDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwhrGjHm3vrAVnBevaDl3maWB cZVQFyMnh4SAicTUs/NYIWwxiQv31rN1MXJxCAlMZ5TounGfBcLZxCTxZWonUBUHB5uAjkTL WReQuIjAHEaJ5u0zGEEcZoGfjBIv+h6DjRIWCJC4cm8+E4jNIqAqceFTCzuIzSvgLNE3aTHU OgWJY1O/gtmcAi4S97/PZwaxhYBqjk9czz6BkXcBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k /NxNjOAgfya9g3FVg8UhRgEORiUe3hM/uQKFWBPLiitzDzFKcDArifDa1nIHCvGmJFZWpRbl xxeV5qQWH2JMBrpqIrOUaHI+MALzSuINjU3MTY1NLU0sTMwsSRNWEudlPPUkQEggPbEkNTs1 tSC1CGYLEwenVAOjpu+uAEnu1I2qojXnefd77brmVOJ34+M9KTOTmD+rt2petVfwerlK+vIj W+UthhlmS1Q5HBttX+VJeDKotM4syy1q8HXzLv3YO0lE8FQqc6CdnsVyY7s5lbNm8Lr77G6I ePfN6FTghCtNl16oLlgizf2+cuXknG1+hlVR4hmXGdZOcbhw9LQSS3FGoqEWc1FxIgAMSaKj tgIAAA== 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 | 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>; }; };