| Message ID | 1391035085-2747-7-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 57de31f6351ecad9212a26d2112b546e4c8b4a5b |
| Headers | show
Return-Path: <patchwork-forward+bncBDF57NG2XIHRBYMFU2LQKGQE5K3XUUY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42DDB20300 for <linaro@patches.linaro.org>; Wed, 29 Jan 2014 22:38:26 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id m10sf5404463vbh.0 for <linaro@patches.linaro.org>; Wed, 29 Jan 2014 14:38:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=w91PMoTrFfuXHKJHbAxl9MgqZAZEymPQhjQNK9EsY6g=; b=Asgy9H+EvPIVn5Rv79NglWPggYkxXkA8A+PHscrblFFNJkgd+iiUbjPMdvyfmbrV3x x9XyVY/gRBKel/X5+U82sgh2u3n5sGqJh9cPPDBwp5DXh9AeoR0ifSKHAVxhkxRyrAoR q2mBqTmxomS0Rn4uyGHEI4kSz6YosJF0U4EH9hPa0T8bDbaxqs2w2JriZHzksBmHIIQh dUvcrkbiJFFYhHERy0NKWIl/zIIR/0o4s7jDnZdQCGNF9VnA994A4TNt7f+jM/AF5ikz uveeLcNGgtALsKExeTFGM9Ah3kHlPEjLFB7cm9cYhCnlI6OH5xowA7J7jvQY86LV8EvK 87Lg== X-Gm-Message-State: ALoCoQmslUAYp2idUuSnbywCz4Lp9FV22CpAe9untkeREnn3zHh8tnKFSRxZ+VSMOJfZfNVDiZvD X-Received: by 10.224.49.72 with SMTP id u8mr3935400qaf.3.1391035105245; Wed, 29 Jan 2014 14:38:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.37 with SMTP id u34ls362972qgu.37.gmail; Wed, 29 Jan 2014 14:38:25 -0800 (PST) X-Received: by 10.58.188.78 with SMTP id fy14mr3645344vec.23.1391035105095; Wed, 29 Jan 2014 14:38:25 -0800 (PST) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id x7si1251849vel.38.2014.01.29.14.38.25 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 14:38:25 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ik5so1649432vcb.9 for <patchwork-forward@linaro.org>; Wed, 29 Jan 2014 14:38:25 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr1373361vdc.18.1391035105017; Wed, 29 Jan 2014 14:38:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp152465vcz; Wed, 29 Jan 2014 14:38:24 -0800 (PST) X-Received: by 10.112.91.228 with SMTP id ch4mr6645205lbb.19.1391035104318; Wed, 29 Jan 2014 14:38:24 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by mx.google.com with ESMTPS id fa7si1972743lbc.85.2014.01.29.14.38.23 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 14:38:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.49 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id y1so1939518lam.8 for <patches@linaro.org>; Wed, 29 Jan 2014 14:38:23 -0800 (PST) X-Received: by 10.112.209.97 with SMTP id ml1mr6861428lbc.26.1391035103747; Wed, 29 Jan 2014 14:38:23 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id wt2sm3998221lbb.2.2014.01.29.14.38.21 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 14:38:22 -0800 (PST) From: Ulf Hansson <ulf.hansson@linaro.org> To: linux-mmc@vger.kernel.org, Chris Ball <chris@printf.net> Cc: Dong Aisheng <b29396@freescale.com>, Stephen Warren <swarren@nvidia.com>, Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>, Adrian Hunter <adrian.hunter@intel.com>, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 06/13] mmc: core: Use generic CMD6 time while switching to eMMC HS200 mode Date: Wed, 29 Jan 2014 23:37:58 +0100 Message-Id: <1391035085-2747-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391035085-2747-1-git-send-email-ulf.hansson@linaro.org> References: <1391035085-2747-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index ae3489a..897fdd1 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -857,7 +857,9 @@ static int mmc_select_hs200(struct mmc_card *card) /* switch to HS200 mode if bus width set successfully */ if (!err) err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_HS_TIMING, 2, 0, true, true, true); + EXT_CSD_HS_TIMING, 2, + card->ext_csd.generic_cmd6_time, + true, true, true); err: return err; }
Conform to the eMMC spec and use the CMD6 generic timeout from the EXT_CSD register, when switching to HS200 mode. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/mmc/core/mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)