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: 2140251 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 29121DF283 for ; Thu, 14 Feb 2013 03:43:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5pgc-0006T1-HI; Thu, 14 Feb 2013 03:40:38 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5pfw-0006KN-DA for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 03:39:57 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI6001GZY5Z1UD0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 12:39:55 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 01.45.03918.A8C5C115; Thu, 14 Feb 2013 12:39:54 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-0f-511c5c8aef0a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FF.35.03918.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-arm-kernel@lists.infradead.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 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+NgFvrCLMWRmVeSWpSXmKPExsWyRsSkTrcrRibQYP87K4tNj6+xOjB6bF5S H8AYxWWTkpqTWZZapG+XwJWxaMkq5oIV0hXXey+yNjDOEu1i5OSQEDCRaH1zkw3CFpO4cG89 kM3FISSwlFFi2fxTzDBFLxsns0IkpjNKPD6zlh3C2cok8f/eMSCHg4NNQEei5awLSFxEYA6j RPP2GYwgDrPABCaJiYtWs4OMEhaIlLhx5gITiM0ioCqx89RFVhCbV8BJomP9DFaIdQoSx6Z+ BbM5BZwlTm05DVYvBFTz7kYXE8hQCYHrbBIf3jxkhxgkIPFt8iEWkCskBGQlNh2AOltS4uCK GywTGIUXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAgMw9P/nkntYFzZYHGIUYCDUYmH V/GXdKAQa2JZcWXuIUYJDmYlEd6XgTKBQrwpiZVVqUX58UWlOanFhxiTgZZPZJYSTc4Hxkhe SbyhsYm5qbGppZGRmakpacJK4ryMp54ECAmkJ5akZqemFqQWwWxh4uCUamCc9Iftt4/0T9aV V2eUME7kzIm/4Hd1VaCzsMdMr+nhtw/s/dQjwmwxY//DDQdWfX58gXddVjPT/J5g7z8lV5Z2 FIrffVZ3ROai38n0lDV5T+PPXKtV3MLk9HF6i1nR6hXbrp+zOu51yO7mfgWuF6uzzX0mC732 /ZObVXfWf3Vb3j8nKQaP8q8BSizFGYmGWsxFxYkAbDkQ2IcCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jQd2uGJlAgzN79Cw2Pb7G6sDosXlJ fQBjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxqIlq5gLVkhXXO+9yNrA OEu0i5GTQ0LAROJl42RWCFtM4sK99WxdjFwcQgLTGSUen1nLDuFsZZL4f+8YkMPBwSagI9Fy 1gUkLiIwh1GiefsMRhCHWWACk8TERavZQUYJC0RK3DhzgQnEZhFQldh56iLYCl4BJ4mO9TOg 1ilIHJv6FczmFHCWOLXlNFi9EFDNuxtdTBMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vO z93ECA7yZ1I7GFc2WBxiFOBgVOLhVfwlHSjEmlhWXJl7iFGCg1lJhPdloEygEG9KYmVValF+ fFFpTmrxIcZkoKsmMkuJJucDIzCvJN7Q2MTc1NjU0sTCxMySNGElcV7GU08ChATSE0tSs1NT C1KLYLYwcXBKNTAG9CkvKy+4dINrD2/b6aslq8qsT52/z2KazzLBrmst551eLasDPS6NrxY2 MvNtrCqd88bjhejO4lpDmTdOLMcf51moPHh2ZtG+c1Ncp0j7re1snpVw8vCLiMDdB50Z9/QV 75Jj921mUS4W0V1yaqOZTsrSzTfYH6pGTHm+wuT4tvqg64rdt12UWIozEg21mIuKEwF8EmJg tgIAAA== 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-20130213_223956_714198_881D6DCF X-CRM114-Status: GOOD ( 10.62 ) 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.34 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 | 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>; }; };