From patchwork Thu Aug 16 17:00:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 10775 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 068B823E56 for ; Thu, 16 Aug 2012 16:44:20 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id AC1ABA180B5 for ; Thu, 16 Aug 2012 16:44:19 +0000 (UTC) Received: by ghbg10 with SMTP id g10so3288007ghb.11 for ; Thu, 16 Aug 2012 09:44:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:subject:date:message-id:x-mailer:x-brightmail-tracker :x-tm-as-mml:x-gm-message-state; bh=nlp3kFQppTYbFko0qACXEOkFw6t3hgyY2YZqOOw8gfY=; b=H64g6f/wAU0UdwjQhu4tYb4Ec0/AYsyZqSpJllX5GFtYuP2wM03t2NBMyXnv0+pQr5 0zqCwHqciNnAofrzq+630GHV4gGLo8ggcGZlRTK2/QhPkVHNG8n/JO24XoKutn/KtxjK YuUqgRkh5VT2W9CM/MDOHsf2GbOO+041xd3FiM4bl0MTT+3x4IOaYXBPPyTBFAnql9CQ 19JsRnKP2rRaPHQEJxhgVCuiZ6w7VXQFZyGm0dMY6hDg6ftA/gofcDqQ/NwBExekaKRi /dMLzCosM59nkF99Wp7CXK28ozB1oQ/TtEiFrYSaMmJHP6c15HA0uvIBdMIflGi75xoa KeKw== Received: by 10.50.94.133 with SMTP id dc5mr3360150igb.16.1345135458724; Thu, 16 Aug 2012 09:44:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp137645igc; Thu, 16 Aug 2012 09:44:18 -0700 (PDT) Received: by 10.68.241.99 with SMTP id wh3mr4675572pbc.16.1345135457982; Thu, 16 Aug 2012 09:44:17 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id qt3si8648287pbc.83.2012.08.16.09.44.17; Thu, 16 Aug 2012 09:44:17 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.33; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm2.samsung.com (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8U00KW8X5SD2G0@mailout3.samsung.com> for patches@linaro.org; Fri, 17 Aug 2012 01:44:16 +0900 (KST) X-AuditID: cbfee61b-b7faf6d00000476a-3f-502d23608105 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FC.96.18282.0632D205; Fri, 17 Aug 2012 01:44:16 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M8U00KFGX3YXM80@mmp1.samsung.com> for patches@linaro.org; Fri, 17 Aug 2012 01:44:16 +0900 (KST) From: Thomas Abraham To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: cjb@laptop.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, linux-mmc@vger.kernel.org, kgene.kim@samsung.com, ben-linux@fluff.org, patches@linaro.org Subject: [PATCH] ARM: dts: use generic mmc properties for Samsung Exynos4210 sdhci nodes Date: Thu, 16 Aug 2012 22:30:29 +0530 Message-id: <1345136429-21930-1-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNJMWRmVeSWpSXmKPExsVy+t9jAd0EZd0Ag86lChZTDn9hcWD0uHNt D1sAYxSXTUpqTmZZapG+XQJXxpuJS1gKJvBX7Oh7zdzA2MLTxcjJISFgIjH9xw1mCFtM4sK9 9WxdjFwcQgKLGCVW3TzADuHMZZJoXTMTrIpNwEDi0cJ37CC2iICXRPea7WBFzAJLGSVWNy9g AkkIC0RJXJg2mQXEZhFQlVi1phNoLAcHr4CnxLufnhDblCQ29B5lmsDIvYCRYRWjaGpBckFx UnqukV5xYm5xaV66XnJ+7iZGsBefSe9gXNVgcYhRgINRiYf3wH/tACHWxLLiytxDjBIczEoi vFdldQOEeFMSK6tSi/Lji0pzUosPMUpzsCiJ85p4f/UXEkhPLEnNTk0tSC2CyTJxcEo1MK4M 2h1xkPOxpqVh859TXr/CLhtbNIhPbjXUVTnotDzZRuPT/ANaP60OnP01++kThr0cH6/Nip98 cZoDd8E7nuNGu24IBCY/T5U9tt/b7+ek5Jtm1/pnJJ8vEDb7b2Z589tieyXP+Rr5y24vrj72 7ejDX/ciin39zF6/fcr3bDI397q2sAypXQ5KLMUZiYZazEXFiQCtL13Z3gEAAA== X-TM-AS-MML: No X-Gm-Message-State: ALoCoQnaJHwJb9BlA8agrCimIHuQaXMEBv2lyGqPE4wNssZpcZyoaVeShOVeBbfZLktybE+cVo7p The SDHCI controller nodes in platforms which are based on Samsung's Exynos4210 SoC are using the older custom Samsung SDHCI bindings. Remove the old Samsung specific bindings and use the generic mmc bindings that are defined for mmc controllers. Cc: Kukjin Kim Cc: Chris Ball Signed-off-by: Thomas Abraham --- arch/arm/boot/dts/exynos4210-origen.dts | 10 ++++------ arch/arm/boot/dts/exynos4210-smdkv310.dts | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 0c49caa..5b5f389 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -30,10 +30,9 @@ }; sdhci@12530000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk2 2 2 3 3>; + cd-gpios = <&gpk2 2 2 3 3>; gpios = <&gpk2 0 2 0 3>, <&gpk2 1 2 0 3>, <&gpk2 3 2 3 3>, @@ -43,10 +42,9 @@ }; sdhci@12510000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk0 2 2 3 3>; + cd-gpios = <&gpk0 2 2 3 3>; gpios = <&gpk0 0 2 0 3>, <&gpk0 1 2 0 3>, <&gpk0 3 2 3 3>, diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 1beccc8..f090095 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -30,10 +30,9 @@ }; sdhci@12530000 { - samsung,sdhci-bus-width = <4>; - linux,mmc_cap_4_bit_data; + bus-width = <4>; samsung,sdhci-cd-internal; - gpio-cd = <&gpk2 2 2 3 3>; + cd-gpios = <&gpk2 2 2 3 3>; gpios = <&gpk2 0 2 0 3>, <&gpk2 1 2 0 3>, <&gpk2 3 2 3 3>,