From patchwork Wed Aug 7 09:10:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2840053 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 0119BBF535 for ; Wed, 7 Aug 2013 09:10:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D488A201FB for ; Wed, 7 Aug 2013 09:10:33 +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 7EA28201F3 for ; Wed, 7 Aug 2013 09:10:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6zkd-0003L8-HS; Wed, 07 Aug 2013 09:09:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6zkO-0000z6-TB; Wed, 07 Aug 2013 09:09:36 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6zjw-0000tt-3x for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2013 09:09:08 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MR500IRGLEG6YF0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2013 18:08:48 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id FA.1F.11618.0AE02025; Wed, 07 Aug 2013 18:08:48 +0900 (KST) X-AuditID: cbfee691-b7fef6d000002d62-a2-52020ea09dd8 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id ED.5E.31505.F9E02025; Wed, 07 Aug 2013 18:08:48 +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 <0MR50025SLEB4110@mmp1.samsung.com>; Wed, 07 Aug 2013 18:08:47 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, padma.v@samsung.com, padma.kvr@gmail.com Subject: [PATCH V3 4/7] ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi Date: Wed, 07 Aug 2013 14:40:13 +0530 Message-id: <1375866616-5541-5-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1375866616-5541-1-git-send-email-padma.v@samsung.com> References: <1375866616-5541-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42JZI2JSpbuAjynI4Govv8XK938ZLaY+fMJm Mf/IOVaL3gVX2Sw2Pb7GajHj/D4mi/Zlc1gtft/8zmaxatcfRgdOj9kNF1k8ds66y+6xaVUn m8fmJfUefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAldH1Yy5TwUKhih0dn5kbGPfwdTFyckgI mEjcX/SdEcIWk7hwbz1bFyMXh5DAUkaJp49Ps8AUfX9zkR0isYhR4vX7LVBOD5PE7RfrgKo4 ONgEdCRazrqANIgITGaU2N2WD2IzC8RKbGxeyAZiCwtEScy42w22jUVAVeLQjC5WEJtXwEni /Pf3bBDLFCSOTf3KCjKSU8BZYsZNV5CwEFDJ8rNbWEHWSghsY5eY13GTGWKOgMS3yYfATpAQ kJXYdIAZYoykxMEVN1gmMAovYGRYxSiaWpBcUJyUXmSqV5yYW1yal66XnJ+7iREYAaf/PZu4 g/H+AetDjMlA4yYyS4km5wMjKK8k3tDYzMjC1MTU2Mjc0ow0YSVxXvUW60AhgfTEktTs1NSC 1KL4otKc1OJDjEwcnFINjP7H59733K7eP/tiYJba+1cvqxt4Kz1Evvfbr97C8G5lZMk5x6wD z6Sz5x/+uHg9t5PC96Z9tYeYvGf+i1BJnTShkllX313Z3uDXJA2RWYWnO26e/2agvP3Eh70T tVfKOF2/K75xh8qzRW+K9828sO1RUZZ51JYVhRou831u/v9UfOR8Ppt1pZQSS3FGoqEWc1Fx IgBAKd0plgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAIsWRmVeSWpSXmKPExsVy+t9jAd0FfExBBhOWsFmsfP+X0WLqwyds FvOPnGO16F1wlc1i0+NrrBYzzu9jsmhfNofV4vfN72wWq3b9YXTg9JjdcJHFY+esu+wem1Z1 snlsXlLv0bdlFaPH501yAWxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koK eYm5qbZKLj4Bum6ZOUBXKSmUJeaUAoUCEouLlfTtME0IDXHTtYBpjND1DQmC6zEyQAMJaxgz un7MZSpYKFSxo+MzcwPjHr4uRk4OCQETie9vLrJD2GISF+6tZ+ti5OIQEljEKPH6/RZ2CKeH SeL2i3UsXYwcHGwCOhItZ11AGkQEJjNK7G7LB7GZBWIlNjYvZAOxhQWiJGbc7WYEsVkEVCUO zehiBbF5BZwkzn9/zwaxTEHi2NSvrCAjOQWcJWbcdAUJCwGVLD+7hXUCI+8CRoZVjKKpBckF xUnpuUZ6xYm5xaV56XrJ+bmbGMHx9Ux6B+OqBotDjAIcjEo8vBVijEFCrIllxZW5hxglOJiV RHgnsDIFCfGmJFZWpRblxxeV5qQWH2JMBjpqIrOUaHI+MPbzSuINjU3MTY1NLU0sTMwsSRNW Euc92GodKCSQnliSmp2aWpBaBLOFiYNTqoExS6TLSlDK0e32jNlX1uceDtUNXrTPY1lMruf/ w++OtiZ80HzJvtfAuZ6xdgrT1H2it3c9LW/g7Kvg+y9ZF6CUtz9w5awFh9L+BWxYe/L/Cy05 g5ykiws4tgUJHLd0KW6XlLKw+24x9/6s79I5OsrP8uNEjI84iJXPEo5kDM2Y4LCubt8M4V1K LMUZiYZazEXFiQClfhoz8wIAAA== 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-20130807_050908_368827_C0BA9888 X-CRM114-Status: UNSURE ( 7.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: abrestic@chromium.org, kgene.kim@samsung.com, broonie@kernel.org, tomasz.figa@gmail.com 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.2 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 I2S nodes shares some properties across exynos5 SoCs (exynos5250 and exyno5420). Common code is moved to exynos5.dtsi which is included in exyno5250 and exynos5420 SoC files. Signed-off-by: Padmavathi Venna --- arch/arm/boot/dts/exynos5.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/exynos5250.dtsi | 12 ------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index ec384c9..c37b57d 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -191,4 +191,25 @@ #size-cells = <0>; status = "disabled"; }; + + i2s0: i2s@03830000 { + reg = <0x03830000 0x100>; + samsung,idma-addr = <0x03000000>; + }; + + i2s1: i2s@12D60000 { + compatible = "samsung,s3c6410-i2s"; + reg = <0x12D60000 0x100>; + dmas = <&pdma1 12 + &pdma1 11>; + dma-names = "tx", "rx"; + }; + + i2s2: i2s@12D70000 { + compatible = "samsung,s3c6410-i2s"; + reg = <0x12D70000 0x100>; + dmas = <&pdma0 12 + &pdma0 11>; + dma-names = "tx", "rx"; + }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 5b36121..3873ff7 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -394,7 +394,6 @@ i2s0: i2s@03830000 { compatible = "samsung,s5pv210-i2s"; - reg = <0x03830000 0x100>; dmas = <&pdma0 10 &pdma0 9 &pdma0 8>; @@ -403,17 +402,11 @@ <&clock_audss EXYNOS_I2S_BUS>, <&clock_audss EXYNOS_SCLK_I2S>; clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; - samsung,idma-addr = <0x03000000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; }; i2s1: i2s@12D60000 { - compatible = "samsung,s3c6410-i2s"; - reg = <0x12D60000 0x100>; - dmas = <&pdma1 12 - &pdma1 11>; - dma-names = "tx", "rx"; clocks = <&clock 307>, <&clock 157>; clock-names = "iis", "i2s_opclk0"; pinctrl-names = "default"; @@ -421,11 +414,6 @@ }; i2s2: i2s@12D70000 { - compatible = "samsung,s3c6410-i2s"; - reg = <0x12D70000 0x100>; - dmas = <&pdma0 12 - &pdma0 11>; - dma-names = "tx", "rx"; clocks = <&clock 308>, <&clock 158>; clock-names = "iis", "i2s_opclk0"; pinctrl-names = "default";