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 X-Patchwork-Id: 1334551 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7543DDFB34 for ; Thu, 16 Aug 2012 16:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014Ab2HPQoT (ORCPT ); Thu, 16 Aug 2012 12:44:19 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:39148 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633Ab2HPQoS (ORCPT ); Thu, 16 Aug 2012 12:44:18 -0400 Received: from epcpsbgm1.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8U00M83X5RNX30@mailout2.samsung.com>; Fri, 17 Aug 2012 01:44:16 +0900 (KST) X-AuditID: cbfee61a-b7fc66d0000043b7-cf-502d236067ee Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 36.7D.17335.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>; 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+NgFjrPJMWRmVeSWpSXmKPExsVy+t9jAd0EZd0Ag9mzlC2O/O9ntJhxfh+T A5PH501yAYxRXDYpqTmZZalF+nYJXBlvJi5hKZjAX7Gj7zVzA2MLTxcjJ4eEgInE8Q99rBC2 mMSFe+vZuhi5OIQEFjFKHFr3lxnCaWOSWD/lGSNIFZuAgcSjhe/YQWwRAS+J7jXb2UGKmAWW Mkqsbl7ABJIQFoiSuDBtMguIzSKgKrFqTSfQWA4OXgFPiXc/PSG2KUls6D3KNIGRewEjwypG 0dSC5ILipPRcQ73ixNzi0rx0veT83E2MYG8+k9rBuLLB4hCjAAejEg+vBJNOgBBrYllxZe4h RgkOZiUR3quyugFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeY29v/oLCaQnlqRmp6YWpBbBZJk4 OKUaGOeWqxpf21yustozpjrT6sLP+vlac9Z2Sp7s/y1gLXvq8vWv01r1/mS/EzmV+mjdXYsZ R//XJb2XKdGt49jqu9T/4TvJQ4ELr4ianXNJPiJ/oSBq7Ybwl3p2PVJfLhqw1TGZzE57fNps c/6Ex/u+XedLiNZOeRkfnOnoIdkboRTS+/pm6/ucGUosxRmJhlrMRcWJAAi+WiPiAQAA X-TM-AS-MML: No Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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>,