From patchwork Mon Feb 11 08:38:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2123531 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 B76273FCA4 for ; Mon, 11 Feb 2013 08:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880Ab3BKIiJ (ORCPT ); Mon, 11 Feb 2013 03:38:09 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:65268 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219Ab3BKIiI (ORCPT ); Mon, 11 Feb 2013 03:38:08 -0500 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 <0MI100KHFRZ14B30@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 11 Feb 2013 17:38:07 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.122]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E3.F0.03918.FEDA8115; Mon, 11 Feb 2013 17:38:07 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-05-5118adefbd9d Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E2.F0.03918.EEDA8115; Mon, 11 Feb 2013 17:38:06 +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 <0MI1001YDRZ0HC30@mmp1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 11 Feb 2013 17:38:06 +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/5] ARM: dts: pl330: Add #dma-cells for generic dma binding support Date: Mon, 11 Feb 2013 14:08:24 +0530 Message-id: <1360571905-15285-5-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1360571905-15285-1-git-send-email-padma.v@samsung.com> References: <1360571905-15285-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsWyRsSkSvf9WolAgyudAhYzzu9jcmD0+LxJ LoAxissmJTUnsyy1SN8ugSvj5rEJzAUrpCvW7rzB2sA4S7SLkZNDQsBEYsK3mewQtpjEhXvr 2boYuTiEBJYySkw/94AdpmjjpseMILaQwCJGiY/dgRBFm5gk7m6Yy9zFyMHBJqAj0XLWBSQu IjCHUaJ5+wxGEIdZYAKTxMRFq9lBioQFIiWeLBEAGcQioCpx+PN6JhCbV8BZ4vurJkaIZQoS x6Z+ZQWxOQVcJFYeuskKsdhZ4tjZI2DXSQjcZpOYvncvO8QgAYlvkw+xgMyXEJCV2HSAGWKO pMTBFTdYJjAKL2BkWMUomlqQXFCclJ5rqFecmFtcmpeul5yfu4kRGIKn/z2T2sG4ssHiEKMA B6MSD29AqESgEGtiWXFl7iFGCQ5mJRHe44fEA4V4UxIrq1KL8uOLSnNSiw8xJgMtn8gsJZqc D4yPvJJ4Q2MTc1NjU0sjIzNTU9KElcR5GU89CRASSE8sSc1OTS1ILYLZwsTBKdXA6CXett73 ZIPpXPPl6k4s7xedearw7+5vTmEOHsflGyxz/qzRTamuqej1Nbu6bkXdrZ5v+7cZhzGYfuRN PLg1Z+fHRQ++7bVTDKkRm3coVOCJ4NGuP5kiGwXWl+9W2Xf1QNNlFZm0ytQWzjVf5BvdyuIz bUUkHi8r6zq/jCGO0zRqTbjPwv1XlViKMxINtZiLihMBRBBv8IUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jAd13ayUCDY5strCYcX4fkwOjx+dN cgGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGTePTWAuWCFdsXbnDdYG xlmiXYycHBICJhIbNz1mhLDFJC7cW88GYgsJLGKU+Ngd2MXIBWRvYpK4u2EucxcjBwebgI5E y1kXkLiIwBxGiebtMxhBHGaBCUwSExetZgcpEhaIlHiyRABkEIuAqsThz+uZQGxeAWeJ76+a oJYpSByb+pUVxOYUcJFYeegmK8RiZ4ljZ4+wTWDkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9d Lzk/dxMjOMCfSe1gXNlgcYhRgINRiYc3IFQiUIg1say4MvcQowQHs5II7/FD4oFCvCmJlVWp RfnxRaU5qcWHGJOBrprILCWanA+MvrySeENjE3NTY1NLEwsTM0vShJXEeRlPPQkQEkhPLEnN Tk0tSC2C2cLEwSnVwGgwT4bB03DZtX+8MdrSc1v5d+5e5rfx3xVd+YUTpxxLdP/KeemFDsMS 76ulXbLrRHdPsitMUGnd/VPD6PcNTWcVtyWiPM1Tmm6cYFL4sfFpb+anXe1vfGIiLj8Mnn7m AOf0prMdf23aO97cME675l/VZr3/qLfsjENOm3w4AvS5A7bVBLH8nK/EUpyRaKjFXFScCAAc tCOptAIAAA== 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 f50b4e8..b1ac73e 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -312,24 +312,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>; }; };