From patchwork Tue Nov 20 17:22:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 1775041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 6EBC73FD1A for ; Tue, 20 Nov 2012 17:25:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TarXX-00083J-Sm; Tue, 20 Nov 2012 17:23:15 +0000 Received: from mail-gg0-f201.google.com ([209.85.161.201]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TarXU-00082b-E0 for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2012 17:23:13 +0000 Received: by mail-gg0-f201.google.com with SMTP id i24so698585ggk.0 for ; Tue, 20 Nov 2012 09:23:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=RgJiUj13wbY22UfCSDiwaZqzNoWgbNMkR1Bp+dsvreY=; b=p26MLDL7rhqnUhsxuWx7CaGKkFCEpeYC7RhWKq4D4/8gfrBvTF5uyvo2oOPI4N1bEJ Hkn/C2GBxyM04l71zZPWMlYheenW7F2Aur4Om9ACie1KddE3t98kzUC7tib5f1oEvAHu ZL1AkZu8M6tVBQCaKmAZX5guTBbnCYUsQsqROTzUNXKC8uIthockcwtGwYKSUGZnj1QH y9I4jaiCZlUGn8QdK0BjTvXS3hgAHvsjUNYXrD/bUjU4EdrwI6qhwMbIV7DBp+dLgpDB Qwtf3GErs6iUEFOgNbmZizTdcB7NzA1TgRVNJ0OYvHG3V3aFTan2ZyHwJAN/1sZgwxaY O5hQ== Received: by 10.236.102.231 with SMTP id d67mr12021590yhg.6.1353432189985; Tue, 20 Nov 2012 09:23:09 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id i7si1027660yhj.6.2012.11.20.09.23.09 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 20 Nov 2012 09:23:09 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id DB6B182004A; Tue, 20 Nov 2012 09:23:09 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 7D15F805D4; Tue, 20 Nov 2012 09:23:09 -0800 (PST) From: Doug Anderson To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: exynos: Move the dwmmc aliases from smdk5250 dts to exynos Date: Tue, 20 Nov 2012 09:22:30 -0800 Message-Id: <1353432158-22999-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.7.3 X-Gm-Message-State: ALoCoQkQtXIDRzspbL15c6Gj54oTynIS5+zO+nHGpP+sizET3vDfLPVXaP3n58ufvY55g2HdwdcvcbHLCrlp4fN/TWc9e351JUaLGgfK1i1Fpd80ITa8TvZ4c8H9gnkM5tjltc2Im3aGh16l9NBikfehs15Fl5n09Gu7YsstVnzVCf+eRAZB7m98U/B9hQZp8JG3W9cCYtiyacDD+gFw6IrHM2/tmvwbfw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121120_122312_545542_57645122 X-CRM114-Status: GOOD ( 10.29 ) X-Spam-Score: -0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.201 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim , Russell King , Leela Krishna Amudala , Doug Anderson , linux-kernel@vger.kernel.org, Thomas Abraham , linux-arm-kernel@lists.infradead.org, Olof Johansson , Naveen Krishna Chatradhi , Arun Kumar K , Rahul Sharma X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The aliases for dwmmc were placed in the SMDK5250 dts file but really should be common for all exynos5250 boards. Move it to the common CPU file. Signed-off-by: Doug Anderson Acked-by: Olof Johansson --- arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 ++++-------- arch/arm/boot/dts/exynos5250.dtsi | 12 ++++++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 405009c..541fe39 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -17,10 +17,6 @@ compatible = "samsung,smdk5250", "samsung,exynos5250"; aliases { - mshc0 = &dwmmc_0; - mshc1 = &dwmmc_1; - mshc2 = &dwmmc_2; - mshc3 = &dwmmc_3; }; memory { @@ -97,7 +93,7 @@ }; }; - dwmmc_0: dwmmc0@12200000 { + dwmmc0@12200000 { num-slots = <1>; supports-highspeed; broken-cd; @@ -118,11 +114,11 @@ }; }; - dwmmc_1: dwmmc1@12210000 { + dwmmc1@12210000 { status = "disabled"; }; - dwmmc_2: dwmmc2@12220000 { + dwmmc2@12220000 { num-slots = <1>; supports-highspeed; fifo-depth = <0x80>; @@ -143,7 +139,7 @@ }; }; - dwmmc_3: dwmmc3@12230000 { + dwmmc3@12230000 { status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index cf6a02d..7c5664b 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -31,6 +31,10 @@ gsc1 = &gsc_1; gsc2 = &gsc_2; gsc3 = &gsc_3; + mshc0 = &dwmmc_0; + mshc1 = &dwmmc_1; + mshc2 = &dwmmc_2; + mshc3 = &dwmmc_3; }; gic:interrupt-controller@10481000 { @@ -206,7 +210,7 @@ #size-cells = <0>; }; - dwmmc0@12200000 { + dwmmc_0: dwmmc0@12200000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12200000 0x1000>; interrupts = <0 75 0>; @@ -214,7 +218,7 @@ #size-cells = <0>; }; - dwmmc1@12210000 { + dwmmc_1: dwmmc1@12210000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12210000 0x1000>; interrupts = <0 76 0>; @@ -222,7 +226,7 @@ #size-cells = <0>; }; - dwmmc2@12220000 { + dwmmc_2: dwmmc2@12220000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12220000 0x1000>; interrupts = <0 77 0>; @@ -230,7 +234,7 @@ #size-cells = <0>; }; - dwmmc3@12230000 { + dwmmc_3: dwmmc3@12230000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12230000 0x1000>; interrupts = <0 78 0>;