From patchwork Wed Jan 29 22:37:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3554951 Return-Path: X-Original-To: patchwork-linux-mmc@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 CAC80C02DC for ; Wed, 29 Jan 2014 22:38:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F29E020170 for ; Wed, 29 Jan 2014 22:38:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2275E2017E for ; Wed, 29 Jan 2014 22:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751514AbaA2WiZ (ORCPT ); Wed, 29 Jan 2014 17:38:25 -0500 Received: from mail-la0-f42.google.com ([209.85.215.42]:46823 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751398AbaA2WiZ (ORCPT ); Wed, 29 Jan 2014 17:38:25 -0500 Received: by mail-la0-f42.google.com with SMTP id hr13so2025193lab.1 for ; Wed, 29 Jan 2014 14:38:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w91PMoTrFfuXHKJHbAxl9MgqZAZEymPQhjQNK9EsY6g=; b=YuKxGO4q10XnlHhjhjaRg4RXKjuLmk/lDleztgMoX5MCh8tJZwL9kyiIgP8u+NyAxK 8gXr7F7OPtnFqSo/JUXmpknS1drBWL5hFhmzz76WuFDde4Wb0Vi0Pq9t5hDsQ73u5s0B WC6zy3se/P0iqb3o73sTB2v4YR9bK91S2+pjYAkfEsRkLNbreqRVwOc+fcnCGmN9K3kU ASoL0twD1GqswEvoxSxTYUZpsXJPQJK2ggV/5HE5cfSBQiSi75R4fTZgyOkmY9ncRjpI KLmE/ZeighEX8FICUKkTXTckzOXzrCtjfHgO/KceQvMnDSz3L/mwqFgkeARbTy94FmfI uvbw== X-Gm-Message-State: ALoCoQkJzxXgnmZAhBqGqyCbdxxIbgCq0WMpciq9J7/1JRRWi5u2Wrxzct3KQs35Vo0/S7TqRHuu 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 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 14:38:22 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Dong Aisheng , Stephen Warren , Vladimir Zapolskiy , Adrian Hunter , Ulf Hansson 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 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 --- drivers/mmc/core/mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; }