From patchwork Thu Dec 12 16:18:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3333101 Return-Path: X-Original-To: patchwork-linux-arm@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 5C3F19F2A9 for ; Thu, 12 Dec 2013 16:19:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96B9A207C3 for ; Thu, 12 Dec 2013 16:19:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5418F207A5 for ; Thu, 12 Dec 2013 16:19: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 1Vr8yk-00070H-2M; Thu, 12 Dec 2013 16:19:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8yd-0001ig-Kb; Thu, 12 Dec 2013 16:19:03 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8yQ-0001gI-9q for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:18:51 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXP007NTBYR7U60@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:18:27 +0000 (GMT) X-AuditID: cbfec7f4-b7f966d0000003d9-d7-52a9e1d3f892 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 88.ED.00985.3D1E9A25; Thu, 12 Dec 2013 16:18:27 +0000 (GMT) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MXP00GA1BYIPS70@eusync2.samsung.com>; Thu, 12 Dec 2013 16:18:27 +0000 (GMT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: dts: exynos4x12: Fix definition of MSHC device tree nodes Date: Thu, 12 Dec 2013 17:18:02 +0100 Message-id: <1386865083-20082-3-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.4.3 In-reply-to: <1386865083-20082-1-git-send-email-t.figa@samsung.com> References: <1386865083-20082-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprELMWRmVeSWpSXmKPExsVy+t/xK7qXH64MMlhwgsvi76Rj7Ba9C66y WZxtesNusenxNVaLGef3MVk8nXCRzeLU9c9sFofftLNavDrYxmKxfsZrFotjM5YwOnB7/P41 idHjzrU9bB6bl9R7XDnRxOrRt2UVo8fnTXIeG+eGBrBHcdmkpOZklqUW6dslcGXMavQumCJd 8X/9R7YGxvuiXYycHBICJhIv5jaxQdhiEhfurQeyuTiEBJYySuxpWQTl9DFJPN6xkBmkik1A TeJzwyOwDhEBDYkpXY/ZQYqYBbqZJb513mYBSQgLhEps6tgL1sAioCpxcFcXK4jNK+Ak8frd RVaIdQoSnWv+M4LYnALOEsevfgPrFQKqufDsAOMERt4FjAyrGEVTS5MLipPScw31ihNzi0vz 0vWS83M3MULC8csOxsXHrA4xCnAwKvHwvji4IkiINbGsuDL3EKMEB7OSCO+9LSuDhHhTEiur Uovy44tKc1KLDzEycXBKNTCmbWcyv3Oy+O5FXsF0Rp+V9zZ+ml/5ZOduJvdTSsu/im2aEiQ+ U+1wcl9hXr2h0rxe15enXnyM0NVQentz9yVzubwGA8n7XXOn5bfEHmbok1A6eYvp+0TZN1YG 03zlFs+uU3blCu1yOxhwSF2cSyBv2bIlO40/qczQTp7c9Mrm18GeroZPKzuVWIozEg21mIuK EwH4bLgsJQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_111850_428949_00333ED3 X-CRM114-Status: UNSURE ( 7.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: linux-samsung-soc@vger.kernel.org, Mike Turquette , Arnd Bergmann , Stephen Warren , Tomasz Figa , Kyungmin Park , Kukjin Kim , Thomas Abraham , Sylwester Nawrocki , Olof Johansson 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 All SoCs from Exynos4x12 series contain the MSHC block, so its node can be located in exynos4x12.dtsi. In addition, missing clock specifiers are added, generic SoC attributes are moved from board dts files to common dtsi file of SoC family and the node is renamed to a more generic name to follow node naming recommendations. Signed-off-by: Tomasz Figa Acked-by: Kyungmin Park --- arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +---- arch/arm/boot/dts/exynos4412-origen.dts | 5 +---- arch/arm/boot/dts/exynos4412.dtsi | 8 -------- arch/arm/boot/dts/exynos4x12.dtsi | 13 +++++++++++++ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 46c678e..8aad5f7 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts @@ -38,9 +38,7 @@ }; }; - mshc@12550000 { - #address-cells = <1>; - #size-cells = <0>; + mmc@12550000 { pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; pinctrl-names = "default"; vmmc-supply = <&ldo20_reg &buck8_reg>; @@ -49,7 +47,6 @@ num-slots = <1>; supports-highspeed; broken-cd; - fifo-depth = <0x80>; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index d65984c..0fe0161 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -122,9 +122,7 @@ status = "okay"; }; - mshc@12550000 { - #address-cells = <1>; - #size-cells = <0>; + mmc@12550000 { pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; pinctrl-names = "default"; status = "okay"; @@ -132,7 +130,6 @@ num-slots = <1>; supports-highspeed; broken-cd; - fifo-depth = <0x80>; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index e743e67..7a0c871 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -34,7 +34,6 @@ <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; }; - mct@10050000 { compatible = "samsung,exynos4412-mct"; reg = <0x10050000 0x800>; @@ -61,11 +60,4 @@ }; }; - 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 ad531fe..1917c82 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi @@ -28,6 +28,7 @@ pinctrl3 = &pinctrl_3; fimc-lite0 = &fimc_lite_0; fimc-lite1 = &fimc_lite_1; + mshc0 = &mshc_0; }; pd_isp: isp-power-domain@10023CA0 { @@ -176,4 +177,16 @@ }; }; }; + + mshc_0: mmc@12550000 { + compatible = "samsung,exynos4412-dw-mshc"; + reg = <0x12550000 0x1000>; + interrupts = <0 77 0>; + #address-cells = <1>; + #size-cells = <0>; + fifo-depth = <0x80>; + clocks = <&clock 301>, <&clock 149>; + clock-names = "biu", "ciu"; + status = "disabled"; + }; };