From patchwork Mon Aug 12 09:49:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2842941 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 84C449F271 for ; Mon, 12 Aug 2013 09:48:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE2D22025B for ; Mon, 12 Aug 2013 09:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BA8A2022A for ; Mon, 12 Aug 2013 09:48:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756030Ab3HLJsm (ORCPT ); Mon, 12 Aug 2013 05:48:42 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:44962 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756027Ab3HLJsl (ORCPT ); Mon, 12 Aug 2013 05:48:41 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRE00FD6WJJ9ZY0@mailout2.samsung.com>; Mon, 12 Aug 2013 18:48:40 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 11.E6.03969.87FA8025; Mon, 12 Aug 2013 18:48:40 +0900 (KST) X-AuditID: cbfee68f-b7f436d000000f81-34-5208af789b07 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 55.BA.31505.77FA8025; Mon, 12 Aug 2013 18:48:39 +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 <0MRE00B1GWKR7O30@mmp2.samsung.com>; Mon, 12 Aug 2013 18:48:39 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, padma.v@samsung.com, padma.kvr@gmail.com Cc: broonie@kernel.org, kgene.kim@samsung.com, tomasz.figa@gmail.com, abrestic@chromium.org Subject: [PATCH V4 3/4] ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi Date: Mon, 12 Aug 2013 15:19:53 +0530 Message-id: <1376300994-1679-4-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1376300994-1679-1-git-send-email-padma.v@samsung.com> References: <1376300994-1679-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42JZI2JSpVuxniPI4PliTouV7/8yWly5eIjJ YurDJ2wW84+cY7XoXXCVzWLT42usFjPO72OyaF82h9Xi983vbBardv1hdODy2PC5ic1jdsNF Fo+ds+6ye2xa1cnmsXlJvUffllWMHp83yQWwR3HZpKTmZJalFunbJXBlfNp0nLXgkWDF289r WRoYm/m6GDk5JARMJC7sPM4CYYtJXLi3nq2LkYtDSGApo8TGG/NYYYq6zn5nhUhMZ5TYvaCX HcLpYZK42fEIKMPBwSagI9Fy1gUkLiKwiVFiyobPYN3MArESG5sXsoHYwgJREhduzgSLswio SnQfmgoW5xVwklj4qA/qDAWJY1O/gtVwCjhLvD8CcZ4QUM3BeS2MIAskBPaxS6y5/YURYpCA xLfJh1hAjpAQkJXYdIAZYo6kxMEVN1gmMAovYGRYxSiaWpBcUJyUXmSsV5yYW1yal66XnJ+7 iREYGaf/PevfwXj3gPUhxmSgcROZpUST84GRlVcSb2hsZmRhamJqbGRuaUaasJI4r1qLdaCQ QHpiSWp2ampBalF8UWlOavEhRiYOTqkGxsYylh83jvDqzHZclt/yI+vg8c0HvWdfnLwk8kJ5 t8g31uDDWycm2FSy1Ba1Rgmlzd/VMDPZOYox0kjl9EL7LXqds8LUtfMsBEuNttkLfXzyfMn2 H+lfreLTt8QyctmGxKc+2u21L0kjJqxDjFeT7Y6MRrq91Y6JKvvt5kx3u+FYU7K7RTVIiaU4 I9FQi7moOBEApYjn56ICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t9jQd3y9RxBBnf+21isfP+X0eLKxUNM FlMfPmGzmH/kHKtF74KrbBabHl9jtZhxfh+TRfuyOawWv29+Z7NYtesPowOXx4bPTWwesxsu snjsnHWX3WPTqk42j81L6j36tqxi9Pi8SS6APaqB0SYjNTEltUghNS85PyUzL91WyTs43jne 1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6D4lhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4h QXA9RgZoIGENY8anTcdZCx4JVrz9vJalgbGZr4uRk0NCwESi6+x3VghbTOLCvfVsXYxcHEIC 0xkldi/oZYdwepgkbnY8Aqri4GAT0JFoOesCEhcR2MQoMWXDZ7BuZoFYiY3NC9lAbGGBKIkL N2eCxVkEVCW6D00Fi/MKOEksfNTHArFNQeLY1K9gNZwCzhLvjxwHiwsB1Ryc18I4gZF3ASPD KkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYzguHsmvYNxVYPFIUYBDkYlHl6PL+xBQqyJZcWV uYcYJTiYlUR41eZxBAnxpiRWVqUW5ccXleakFh9iTAa6aiKzlGhyPjAl5JXEGxqbmJsam1qa WJiYWZImrCTOe7DVOlBIID2xJDU7NbUgtQhmCxMHp1QDY4TFX6G95j7LCnJ5hObf3X/yYIDF 9iTm0/32xv/5VoWGB8X/3xAe//WqJ1unRcrm1/wmi69X7P6hNL/w4e226wfM21O0NzWa/3j9 ZLb31MBDcvwi3gvWlgr0Jbbv3bH9uWOwu6dnrFb0pzf3liyfPa9BqzfMcGezAJM945tGm7sZ H76dvs3FpsRSnJFoqMVcVJwIANRG5jj/AgAA 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 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 f65e124..aae2fa1 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -108,4 +108,25 @@ interrupts = <0 42 0>; status = "disabled"; }; + + i2s0: i2s@03830000 { + reg = <0x03830000 0x100>; + samsung,idma-addr = <0x03000000>; + }; + + i2s1: i2s@12D60000 { + compatible = "samsung,i2s-v5"; + reg = <0x12D60000 0x100>; + dmas = <&pdma1 12 + &pdma1 11>; + dma-names = "tx", "rx"; + }; + + i2s2: i2s@12D70000 { + compatible = "samsung,i2s-v5"; + 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 ef57277..f941d52 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -406,7 +406,6 @@ i2s0: i2s@03830000 { compatible = "samsung,i2s-v5"; - reg = <0x03830000 0x100>; dmas = <&pdma0 10 &pdma0 9 &pdma0 8>; @@ -418,17 +417,11 @@ samsung,supports-6ch; samsung,supports-rstclr; samsung,supports-secdai; - samsung,idma-addr = <0x03000000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; }; i2s1: i2s@12D60000 { - compatible = "samsung,i2s-v5"; - 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"; @@ -436,11 +429,6 @@ }; i2s2: i2s@12D70000 { - compatible = "samsung,i2s-v5"; - 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";