From patchwork Wed Jan 22 15:00:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3523911 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 9FEDFC02DD for ; Wed, 22 Jan 2014 15:00:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B8412013D for ; Wed, 22 Jan 2014 15:00:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CB282011D for ; Wed, 22 Jan 2014 15:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755372AbaAVPAj (ORCPT ); Wed, 22 Jan 2014 10:00:39 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:41112 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755316AbaAVPAi (ORCPT ); Wed, 22 Jan 2014 10:00:38 -0500 Received: by mail-wi0-f174.google.com with SMTP id g10so5713021wiw.1 for ; Wed, 22 Jan 2014 07:00:37 -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=M6LIIFMv1dNo6lcA7uuTlUe4Fy+EpNq6qVs2A01Edn5gdjxmKAxafg60GpHA/UqBNu e+pOj3pjJF1zKF0jzeX7GFnokm8vPP7O2gUP/WohaS9YY9XvulciNy8KzscQfNwZ2fYp TFZP6pw8nszOaRjReYdJMYYhNtbxxw8igr2cgVgdZ0wQ0cCYtRmBDTojCqcF1533o+7d J/fQ4C507kve/atPT07l9lqNsQtm1SkaRGJQBYesUiccipLkfaVde7pgTAYgp4yarlCN +im/gYRvxgT6mpoQcNCZ7KN/ww57JheZyTHFBnelW/GCL6Fim1Iv5WTdmgaoPHrHader xlVw== X-Gm-Message-State: ALoCoQlN/+ySzgRd7z9sg4jFR8lzgPKMrE4LAgUqnBESmqmZlqaLvZbPeizYXO/de+O7K0zktVAG 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 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 07:00:37 -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 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> 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.5 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; }