From patchwork Tue Sep 16 08:50:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4915401 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 40799BEEA5 for ; Tue, 16 Sep 2014 08:50:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9186D2026C for ; Tue, 16 Sep 2014 08:50:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97EE0201DD for ; Tue, 16 Sep 2014 08:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753249AbaIPIua (ORCPT ); Tue, 16 Sep 2014 04:50:30 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:40861 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752278AbaIPIu2 (ORCPT ); Tue, 16 Sep 2014 04:50:28 -0400 Received: by mail-pd0-f176.google.com with SMTP id y13so8246605pdi.7 for ; Tue, 16 Sep 2014 01:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=X3av9Gy9tha84OhpE6BENdPpWnMNdwAjiNELAAlA1/E=; b=0pA0KgbHqzbsqJgejBxpIRdpObokfQLxp9zY0muGWnaY3+7jxMVBpV10Jrkxh1l/XA LCJVWOpWPJ4BEqa4aTdJ71s+zbi1IDUUtnOnHHXbCZq4PRGHNwoP28iLilQNFEXLwexu XEj0QnK3nnthVwpIdVGwvxYykOADjeE2o1bc7iy6kxcNWSGwnxuS7yYPZUB4Dq8TgDF2 pzTkdqLhzqhrZFBDFiB7dQrPFGxklW8vb7ZCb9B2T8MNEjOtDqPRBRKarh8Sa5rOx9Vq bqKgesB6YwxUQN83s5UkOMgu/prOfusqOLjRO1jAM++Xb2NYu71dISoh7IRiAI4gPNce sRJA== X-Received: by 10.70.94.201 with SMTP id de9mr25116350pdb.103.1410857426124; Tue, 16 Sep 2014 01:50:26 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id cn3sm13461994pbc.67.2014.09.16.01.50.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 01:50:25 -0700 (PDT) From: Vivek Gautam To: linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kgene.kim@samsung.com, dianders@chromium.org, jh80.chung@samsung.com, tgih.jun@samsung.com, javier.martinez@collabora.co.uk, khilman@linaro.org, Naveen Krishna Chatradhi Subject: [PATCH RESEND] ARM: DTS: correct the capability string for mmc0 Date: Tue, 16 Sep 2014 14:20:09 +0530 Message-Id: <1410857409-24767-1-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Naveen Krishna Chatradhi MMC capability for HS200 is parsed in mmc/core/host.c as dts string "mmc-hs200-1_8v". This patch corrects the dts string for Exynos5420 based peach-pit and Exynos5800 based peach-pi boards. Signed-off-by: Naveen Krishna Chatradhi Reviewed-by: Doug Anderson Signed-off-by: Vivek Gautam --- Hi Kukjin, As commented by Doug earlier for this patch, the two patches required -- mmc: dw_mmc: Make sure we don't get stuck when we get an error -- mmc: dw_mmc: change to use recommended reset procedure are now merged in upstream. So you can go ahead and pick this change. arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 9a23382..e52ed04 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -560,7 +560,7 @@ status = "okay"; num-slots = <1>; broken-cd; - caps2-mmc-hs200-1_8v; + mmc-hs200-1_8v; cap-mmc-highspeed; non-removable; card-detect-delay = <200>; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 1d31c81..8616fbd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -548,7 +548,7 @@ status = "okay"; num-slots = <1>; broken-cd; - caps2-mmc-hs200-1_8v; + mmc-hs200-1_8v; cap-mmc-highspeed; non-removable; card-detect-delay = <200>;