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: 2102141 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 F30143FCFC for ; Wed, 6 Feb 2013 06:18:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964Ab3BFGSk (ORCPT ); Wed, 6 Feb 2013 01:18:40 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:46474 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890Ab3BFGSj (ORCPT ); Wed, 6 Feb 2013 01:18:39 -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 <0MHS005BYC64HKN0@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 06 Feb 2013 15:18:33 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E9.F3.03918.9B5F1115; Wed, 06 Feb 2013 15:18:33 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-5f-5111f5b97f96 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 88.F3.03918.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-samsung-soc@vger.kernel.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 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 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+NgFvrELMWRmVeSWpSXmKPExsWyRsSkWnfnV8FAg52LNS1mnN/H5MDo8XmT XABjFJdNSmpOZllqkb5dAlfG9dUJBT/EKxb86mZpYDwn1MXIySEhYCIxac5iNghbTOLCvfVg tpDAUkaJ/5ctYGrWXN/M3MXIBRRfxCgx/ccXdghnE5PE+nMzWLsYOTjYBHQkWs66gMRFBOYw SjRvn8EI4jAL/GSUeNH3mBVklLBAgMSj7ZsYQWwWAVWJWZt/sYPYvAJOEkdO3oQ6Q0Hi2NSv YPWcAs4Syzr6GCFOcpJ4ufY6K8hQCYHrbBJnbt6FGiQg8W3yIRaQKyQEZCU2HWCGmCMpcXDF DZYJjMILGBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+duYgSG4Ol/z6R2MK5ssDjEKMDBqMTD e0NPMFCINbGsuDL3EKMEB7OSCK/tZ6AQb0piZVVqUX58UWlOavEhxmSg5ROZpUST84HxkVcS b2hsYm5qbGppZGRmakqasJI4L+OpJwFCAumJJanZqakFqUUwW5g4OKUaGC3W9FTc/3bSYd93 pbnf/ltaBV87/tn14Yt78yLnbpB7cmbtyr0HBX9MM1CXmOHLZ6X5xHGyszLLk6Up+ppu7bEr hIS/Xv3e2GduUcP/UvFhW4uV0ou5az5sjDeXavjA+bW5/Nv2qY4Vxx/enJijlKAU8YFHSeHP rAdPbl7vDVs/df/s2kmSG5YosRRnJBpqMRcVJwIAgFvX34UCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAd2dXwUDDXaekrOYcX4fkwOjx+dN cgGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGddXJxT8EK9Y8KubpYHx nFAXIyeHhICJxJrrm5khbDGJC/fWs3UxcnEICSxilJj+4ws7hLOJSWL9uRmsXYwcHGwCOhIt Z11A4iICcxglmrfPYARxmAV+Mkq86HvMCjJKWCBA4tH2TYwgNouAqsSszb/YQWxeASeJIydv skGsU5A4NvUrWD2ngLPEso4+sHohoJqXa6+zTmDkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9d Lzk/dxMjOMSfSe1gXNlgcYhRgINRiYf3hp5goBBrYllxZe4hRgkOZiURXtvPQCHelMTKqtSi /Pii0pzU4kOMyUBXTWSWEk3OB8ZfXkm8obGJuamxqaWJhYmZJWnCSuK8jKeeBAgJpCeWpGan phakFsFsYeLglGpglHvy+Y7xwQpeqTM7bW98X5Lof+P/k8Vmcz9GKNhdOsrT1lv83OeF25ao zXWX/myd92z/+ezTfAtvHWqfyRtSdzF100+Fdv+QjyozC2JYxPo2saaISUWla96RvH1aXk/M 2mqZoV1l+aYpsw7HB/UHbCztdf8W9ZetXnvNHf5Vp3zjRfvZPN4eVWIpzkg01GIuKk4EAKIq I2G1AgAA 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>; }; };