From patchwork Tue Aug 20 13:52:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2847101 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 C6BA0BF546 for ; Tue, 20 Aug 2013 13:55:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3753520465 for ; Tue, 20 Aug 2013 13:55:38 +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 E76C72045E for ; Tue, 20 Aug 2013 13:55:36 +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 1VBmOH-0007nm-Gm; Tue, 20 Aug 2013 13:54:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBmNy-0004ut-GA; Tue, 20 Aug 2013 13:54:14 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBmNJ-0004oK-4M for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 13:53:34 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRU00BVB18621A0@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 14:53:03 +0100 (BST) X-AuditID: cbfec7f5-b7f5f6d00000105f-9e-521374bf682b Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 49.81.04191.FB473125; Tue, 20 Aug 2013 14:53:03 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MRU00BA81854D30@eusync4.samsung.com>; Tue, 20 Aug 2013 14:53:03 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 5/8] ARM: dts: exynos4x12: Move mshc node to exynos4x12.dtsi Date: Tue, 20 Aug 2013 15:52:45 +0200 Message-id: <1377006768-23174-6-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.3.2 In-reply-to: <1377006768-23174-1-git-send-email-t.figa@samsung.com> References: <1377006768-23174-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrALMWRmVeSWpSXmKPExsVy+t/xa7r7S4SDDGbfN7b4O+kYu8X8I+dY LfrfLGS1eNPbwWLRu+Aqm8XZpjfsFpseX2O1mHF+H5PF0usXmSxOXf/MZjFh+loWi8MrDjBZ HH7Tzmrx6mAbi8X6Ga9ZLI7NWMLoIOCxZt4aRo/fvyYxeiz4fIXd4/XkCYwel/t6mTzuXNvD 5rF5Sb3HlRNNrB59W1YxenzeJOexcW5oAHcUl01Kak5mWWqRvl0CV8ady1sZC9ZyVey/cZ25 gXEtRxcjJ4eEgInEzh+b2SFsMYkL99azdTFycQgJLGWU6Fm4E8rpY5LY+OowI0gVm4CaxOeG R2wgtoiAqsTntgXsIEXMAk+ZJXbsms8CkhAW8JF4/HQx2FgWoKI5H5tYQWxeASeJ+Us+MUGs U5BY9mUtM4jNKeAs0fppDVi9EFDN0Z4nTBMYeRcwMqxiFE0tTS4oTkrPNdIrTswtLs1L10vO z93ECAn1rzsYlx6zOsQowMGoxMPLAYwBIdbEsuLK3EOMEhzMSiK82zKAQrwpiZVVqUX58UWl OanFhxiZODilGhiVW+YtydN8pnF//cn3rebXPnyp4JNndVKbxRuzfWKnhv9F/qtXeUy6MvvZ Gx6+O9KSk+H0iuNns//Zq96bRMuZn1XmTv2k7H1mzQWDiZ8efubuCpaqrBRbqfTk+aa58cyX uhgMI1rWHJm30Dty0bxt15g2PrjgwP0+szZnx4fpknNb9bz+WyxXYinOSDTUYi4qTgQADokq HlMCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130820_095333_304722_B91A9E2D X-CRM114-Status: UNSURE ( 7.97 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -9.7 (---------) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Kukjin Kim , ian.campbell@citrix.com, pawel.moll@arm.com, swarren@wwwdotorg.org, Arnd Bergmann , Tomasz Figa , rob.herring@calxeda.com, Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , galak@codeaurora.org, Olof Johansson , linux-arm-kernel@lists.infradead.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=-7.0 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 All SoCs from Exynos4x12 series contain the MSHC block, so its node can be located in exynos4x12.dtsi. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/boot/dts/exynos4412.dtsi | 8 -------- arch/arm/boot/dts/exynos4x12.dtsi | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 1388ce0..6b0184f 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -34,12 +34,4 @@ <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; }; - - mshc@12550000 { - compatible = "samsung,exynos4412-dw-mshc"; - reg = <0x12550000 0x1000>; - interrupts = <0 77 0>; - #address-cells = <1>; - #size-cells = <0>; - }; }; diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 3d7182a..06cef96 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -196,4 +196,12 @@ }; }; }; + + mshc@12550000 { + compatible = "samsung,exynos4412-dw-mshc"; + reg = <0x12550000 0x1000>; + interrupts = <0 77 0>; + #address-cells = <1>; + #size-cells = <0>; + }; };