| Message ID | 1390402824-9850-6-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show
Return-Path: <patchwork-forward+bncBDF57NG2XIHRBNN576LAKGQEIOVNP7Y@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1450A218CB for <linaro@patches.linaro.org>; Wed, 22 Jan 2014 15:07:33 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id vb8sf1648779obc.2 for <linaro@patches.linaro.org>; Wed, 22 Jan 2014 07:07:33 -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=d3HTQSGFvXZJFVrTYGkhk9IJAD6GsjMDqaYDGR08lDm6B2rUgAcVykgVcWGLdnexri 27Fs+c3iOaChunhbzdWdduWT0hmVK/21gkrjry+f8bmd93enqMtK9GcLOZQ328PAMeno FsGS98oC0MPD6MG28Gxh/FlBEX8H2rFI/OfthSEXZDSIRYXmErXpK8KSVCqsRkZN3MVB ShfMIsKwsIapcz4Uy3Y7qB7B28G5drB4alyZ0A+Q49le3MJHKb7PrpO25N//IKFPqwr5 2yUOdTv6yKfaHIsL4tdaKMsXMJAcJ/jtmpH/IoXCKRADpVuzm+PM0zt3EPuf7JsS5ytv az/w== X-Gm-Message-State: ALoCoQlOGgc9X3jdDHNFd7Ad/u9q/l4tVntmmgLDbxPCSzhMKKRIkxjiflzgfgm4B5HxVNJk3LHi X-Received: by 10.182.16.199 with SMTP id i7mr729655obd.42.1390403253183; Wed, 22 Jan 2014 07:07:33 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.106 with SMTP id 97ls65486qgm.29.gmail; Wed, 22 Jan 2014 07:07:33 -0800 (PST) X-Received: by 10.220.247.68 with SMTP id mb4mr418346vcb.37.1390403253079; Wed, 22 Jan 2014 07:07:33 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id z15si4704606vce.72.2014.01.22.07.07.33 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 07:07:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id lf12so287013vcb.17 for <patchwork-forward@linaro.org>; Wed, 22 Jan 2014 07:07:33 -0800 (PST) X-Received: by 10.58.187.98 with SMTP id fr2mr386771vec.38.1390402839556; Wed, 22 Jan 2014 07:00:39 -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 u4csp190324vcz; Wed, 22 Jan 2014 07:00:39 -0800 (PST) X-Received: by 10.194.80.137 with SMTP id r9mr2236786wjx.88.1390402838452; Wed, 22 Jan 2014 07:00:38 -0800 (PST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id bf6si6906201wjc.14.2014.01.22.07.00.37 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 07:00:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.212.172; Received: by mail-wi0-f172.google.com with SMTP id ex4so5700765wid.17 for <patches@linaro.org>; Wed, 22 Jan 2014 07:00:37 -0800 (PST) X-Received: by 10.194.63.228 with SMTP id j4mr2373643wjs.34.1390402837814; Wed, 22 Jan 2014 07:00:37 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id dd3sm15401824wjb.9.2014.01.22.07.00.36 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 07:00:37 -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 05/10] mmc: core: Use generic CMD6 time while switching to eMMC HS200 mode Date: Wed, 22 Jan 2014 16:00:19 +0100 Message-Id: <1390402824-9850-6-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390402824-9850-1-git-send-email-ulf.hansson@linaro.org> References: <1390402824-9850-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.172 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(-)