From patchwork Wed Jul 10 12:14: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: 2825708 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91A87C0AB2 for ; Wed, 10 Jul 2013 12:52:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DF4420177 for ; Wed, 10 Jul 2013 12:52:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6D7C32016D for ; Wed, 10 Jul 2013 12:52:08 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwtEZ-0002E7-4o; Wed, 10 Jul 2013 12:11:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwtCx-0002EB-1W; Wed, 10 Jul 2013 12:09:19 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwtCv-0002Cw-Bj for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2013 12:09:17 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MPP00G7OZ2WGJC0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2013 21:08:56 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 63.80.29708.8DE4DD15; Wed, 10 Jul 2013 21:08:56 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-69-51dd4ed87831 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A8.7A.28381.8DE4DD15; Wed, 10 Jul 2013 21:08:56 +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 <0MPP00L2GZ2NNL00@mmp1.samsung.com>; Wed, 10 Jul 2013 21:08:56 +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 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Date: Wed, 10 Jul 2013 17:44:08 +0530 Message-id: <1373458449-19039-2-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1373458449-19039-1-git-send-email-padma.v@samsung.com> References: <1373458449-19039-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWyRsSkWveG391AgysXpCxWvv/LaDH14RM2 iwOzH7JanF12kM2id8FVNotNj6+xWsw4v4/Jon3ZHFaL3ze/s1lcXPGFyeJl334WB26P2Q0X WTx2zrrL7rF4z0smj02rOtk8Ni+p9zg/YyGjR9+WVYwenzfJBXBEcdmkpOZklqUW6dslcGXM fNPMVPBXsmL+/3eMDYzvhLsYOTkkBEwkHnZuZ4OwxSQu3FsPZHNxCAksZZR4d/cuYxcjB1hR +3FTkBohgUWMEkcfu0DU9DBJ7Ht4nRWkhk1AR6LlLFhcRGAOo0Tz9hmMIA6zQAejxN1b/Ywg 3cICoRLv73wFs1kEVCVubb3AAmLzCjhLvNr3jh3iCgWJY1O/soLYnAIuEjuWzmGH2OwsseBi P9hQCYFL7BK/9txjhRgkIPFt8iEWiEtlJTYdYIaYIylxcMUNlgmMwgsYGVYxiqYWJBcUJ6UX megVJ+YWl+al6yXn525iBMbK6X/PJuxgvHfA+hBjMtC4icxSosn5wFjLK4k3NDYzsjA1MTU2 Mrc0I01YSZxXvcU6UEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAOjXhuDWuP/hV+mtCwvTWEQ nVZ0bOLCfbPk99xwLuA+aZd6acsUyylsOiIcfo/E/vKuWcExIy3Caefk71yVp2bpXJF+yrBK 7k6F657FT1MbH66LmyH0iqlx2hH1vhJPzTobnSf2J91T/CUtWWr1PUXf7/V94rBYXU039Ylf l0vLpxl3amsnpdYpsRRnJBpqMRcVJwIAeOYK3qsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKIsWRmVeSWpSXmKPExsVy+t9jAd0bfncDDeZsFrRY+f4vo8XUh0/Y LA7MfshqcXbZQTaL3gVX2Sw2Pb7GajHj/D4mi/Zlc1gtft/8zmZxccUXJouXfftZHLg9Zjdc ZPHYOesuu8fiPS+ZPDat6mTz2Lyk3uP8jIWMHn1bVjF6fN4kF8AR1cBok5GamJJapJCal5yf kpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQN0qZJCWWJOKVAoILG4WEnfDtOE 0BA3XQuYxghd35AguB4jAzSQsIYxY+abZqaCv5IV8/+/Y2xgfCfcxcjBISFgItF+3LSLkRPI FJO4cG89G4gtJLCIUeLoY5cuRi4gu4dJYt/D66wg9WwCOhItZ8HiIgJzGCWat89gBHGYBToY Je7e6mcE6RYWCJV4f+crmM0ioCpxa+sFFhCbV8BZ4tW+d+wQ2xQkjk39ygpicwq4SOxYOocd YrOzxIKL/YwTGHkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAiOxGdSOxhXNlgcYhTg YFTi4T2gcCdQiDWxrLgy9xCjBAezkgivutXdQCHelMTKqtSi/Pii0pzU4kOMyUBXTWSWEk3O ByaJvJJ4Q2MTc1NjU0sTCxMzS9KElcR5D7RaBwoJpCeWpGanphakFsFsYeLglGpgPK3HYfZp 3SyLadzRHo6bN/IWv1u/y7Tx0KyTy2JEbZn2X/tg/XbjFt3iosi/p+K0K+KdhTUKDE0mbs/s qnc0i5ks35/qXlBwdH3Rz8dLnu7Jyvf8dHPRTZvO7LyMm1+ym7eZ6gacOuDJ+LHuj174jj9V dluOzWj+apX/noVbnvc5u0XkM+69SizFGYmGWsxFxYkAvbPlEQgDAAA= 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-20130710_080917_628262_2B271E32 X-CRM114-Status: UNSURE ( 8.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.2 (-------) Cc: kgene.kim@samsung.com, abrestic@chromium.org, sbkim73@samsung.com, dianders@chromium.org, vinod.koul@intel.com, broonie@kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP exynos5250 and exynos5420 has 4 DMA controllers in common. So this patch moves these nodes to common file keeping the dma controllers clk info in the exynos5250 dtsi file. Signed-off-by: Padmavathi Venna --- arch/arm/boot/dts/exynos5.dtsi | 44 +++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/exynos5250.dtsi | 30 ------------------------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index f65e124..cac35c8 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -50,6 +50,50 @@ interrupts = <1 9 0xf04>; }; + amba { + #address-cells = <1>; + #size-cells = <1>; + compatible = "arm,amba-bus"; + interrupt-parent = <&gic>; + ranges; + + pdma0: pdma@121A0000 { + 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>; + }; + }; + dwmmc_0: dwmmc0@12200000 { compatible = "samsung,exynos5250-dw-mshc"; interrupts = <0 75 0>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 41cd625..3a474c4 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -511,54 +511,24 @@ }; amba { - #address-cells = <1>; - #size-cells = <1>; - compatible = "arm,amba-bus"; - interrupt-parent = <&gic>; - ranges; - pdma0: pdma@121A0000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x121A0000 0x1000>; - interrupts = <0 34 0>; clocks = <&clock 275>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; }; pdma1: pdma@121B0000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x121B0000 0x1000>; - interrupts = <0 35 0>; clocks = <&clock 276>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; }; mdma0: mdma@10800000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x10800000 0x1000>; - interrupts = <0 33 0>; clocks = <&clock 271>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; }; mdma1: mdma@11C10000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x11C10000 0x1000>; - interrupts = <0 124 0>; clocks = <&clock 271>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; }; };