From patchwork Wed Aug 7 08:50:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2840010 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 79EBDBF535 for ; Wed, 7 Aug 2013 08:51:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A05D7201EE for ; Wed, 7 Aug 2013 08:51:55 +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 4C7A0201E2 for ; Wed, 7 Aug 2013 08:51:54 +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 1V6zSI-0007PM-KR; Wed, 07 Aug 2013 08:50:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6zRv-0000QA-6u; Wed, 07 Aug 2013 08:50:31 +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 1V6zR9-0000Jt-KZ for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2013 08:49:45 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MR500JF0KGZ2PE0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2013 17:49:29 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id BE.C5.11618.91A02025; Wed, 07 Aug 2013 17:49:29 +0900 (KST) X-AuditID: cbfee691-b7fef6d000002d62-ff-52020a197910 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 38.2A.31505.91A02025; Wed, 07 Aug 2013 17:49:29 +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 <0MR5006C8KHPAM70@mmp2.samsung.com>; Wed, 07 Aug 2013 17:49:29 +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 4/7] ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi Date: Wed, 07 Aug 2013 14:20:39 +0530 Message-id: <1375865442-5323-8-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1375865442-5323-1-git-send-email-padma.v@samsung.com> References: <1375865442-5323-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42JZI2JSpyvJxRRkcPKutMXK938ZLaY+fMJm Mf/IOVaL3gVX2Sw2Pb7GajHj/D4mi/Zlc1gtft/8zmaxatcfRgdOj9kNF1k8ds66y+6xaVUn m8fmJfUefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAldH1Yy5TwUKhih0dn5kbGPfwdTFyckgI mEi8+nObBcIWk7hwbz1bFyMXh5DAUkaJwxsuMMIUnZnRygqRmM4o8f3/bhYIp4dJ4uaTfcxd jBwcbAI6Ei1nXUAaRAQmM0rsbssHsZkFYiU2Ni9kA7GFBcIl1vVsYwaxWQRUJT4tmc4EYvMK OEkc6+xnh1imIHFs6ldWEJtTwFni0Y81YLYQUM3uq9ugLt3GLvHusxnEHAGJb5MPsYCcICEg K7HpADNEiaTEwRU3WCYwCi9gZFjFKJpakFxQnJReZKpXnJhbXJqXrpecn7uJERgBp/89m7iD 8f4B60OMyUDjJjJLiSbnAyMoryTe0NjMyMLUxNTYyNzSjDRhJXFe9RbrQCGB9MSS1OzU1ILU ovii0pzU4kOMTBycUg2MJXusYj69jue5+WZnmZ49b/D74hvsJR1rvy55WqLHsrxaIMvt0f6k 95pfAp+lfWrd164r2BMZIXb9g/5B2cysF/LPFf7/+XFHaF5cgWjWSu6XIsc8Vq1tWq77y2yb yeEyLqNf/uGF8xSuf7WcWrp7kk6uw1++OzXhuZfWNDzT8BFX6DZi2H5QiaU4I9FQi7moOBEA qkFwvJYCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIIsWRmVeSWpSXmKPExsVy+t9jQV1JLqYgg/UThCxWvv/LaDH14RM2 i/lHzrFa9C64ymax6fE1VosZ5/cxWbQvm8Nq8fvmdzaLVbv+MDpwesxuuMjisXPWXXaPTas6 2Tw2L6n36NuyitHj8ya5ALaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWF vMTcVFslF58AXbfMHKCrlBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZ XT/mMhUsFKrY0fGZuYFxD18XIyeHhICJxJkZrawQtpjEhXvr2boYuTiEBKYzSnz/v5sFwulh krj5ZB9zFyMHB5uAjkTLWReQBhGByYwSu9vyQWxmgViJjc0L2UBsYYFwiXU925hBbBYBVYlP S6Yzgdi8Ak4Sxzr72SGWKUgcm/oVbDGngLPEox9rwGwhoJrdV7exTGDkXcDIsIpRNLUguaA4 KT3XSK84Mbe4NC9dLzk/dxMjOMKeSe9gXNVgcYhRgINRiYe3QowxSIg1say4MvcQowQHs5II 7wRWpiAh3pTEyqrUovz4otKc1OJDjMlAV01klhJNzgdGf15JvKGxibmpsamliYWJmSVpwkri vAdbrQOFBNITS1KzU1MLUotgtjBxcEo1MG51+sjyacPcmEeXBH1+u5o8nLH6VeqVDzqMG5Yt iyq96Sh09szaucuSb/DM/sEWsOWbbXtBPufJz1+P1YnaCjwNn1dkrZKxPadA+ZjrBk3O6B2G 86ZGGH6sOvRJZxNHi/SswoOVe7KK5RdOW8V97tb5M80LeE8qrfa8umndxVmFDcUGx0sESvcq sRRnJBpqMRcVJwIAuN3HLvQCAAA= 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_044944_015433_3641D467 X-CRM114-Status: UNSURE ( 7.76 ) 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";