From patchwork Wed Apr 18 09:56:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10347733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D77B360542 for ; Wed, 18 Apr 2018 09:57:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB7BE285DB for ; Wed, 18 Apr 2018 09:57:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C04E8285DC; Wed, 18 Apr 2018 09:57:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61522285DD for ; Wed, 18 Apr 2018 09:57:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878AbeDRJ5L (ORCPT ); Wed, 18 Apr 2018 05:57:11 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:36191 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751407AbeDRJ5K (ORCPT ); Wed, 18 Apr 2018 05:57:10 -0400 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id D81ED25BE76; Wed, 18 Apr 2018 19:57:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1524045427; bh=zPUKPYlMv8QLgeGIt0Hi4ttGs/uAK6veb2V4Kfn6CBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bkgUX38NwkOeOspkJXDnfNJkiDjeNFLM4YE+oeqFUX20aZEC5u6glQ5j24pueNBzy mXUBjds1xQeKPph8EBgaQfuI3fOdd9EwHngeyWp9TdKy0v3c3CngMsGidLdttqjl+X JgzP/AkX/WSISqYHe6LNOsaIM3h07Mbz0JDB8wQg= Received: by penelope.horms.nl (Postfix, from userid 7100) id B0D30E20910; Wed, 18 Apr 2018 11:57:04 +0200 (CEST) From: Simon Horman To: Wolfram Sang , Ulf Hansson Cc: Magnus Damm , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Simon Horman Subject: [PATCH v4 1/4] mmc: core: select HS400 from HS200 tuning function Date: Wed, 18 Apr 2018 11:56:57 +0200 Message-Id: <20180418095700.29948-2-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180418095700.29948-1-horms+renesas@verge.net.au> References: <20180418095700.29948-1-horms+renesas@verge.net.au> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Call mmc_select_hs400() from mmc_hs200_tuning(). This should have no run-time effect as the existing call to mmc_select_hs400() is right after a call to mmc_hs200_tuning() in mmc_init_card() and that is the only caller of mmc_hs200_tuning(). This is in preparation for adding a new mmc_host_opp to be called after tuning and selecting HS400 - or in other words, after mmc_execute_tuning() and mmc_select_hs400(). Signed-off-by: Simon Horman --- v4 - New patch --- drivers/mmc/core/mmc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 6f8ebd6caa4c..099b327e10ca 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1508,6 +1508,7 @@ static int mmc_select_timing(struct mmc_card *card) static int mmc_hs200_tuning(struct mmc_card *card) { struct mmc_host *host = card->host; + int err; /* * Timing should be adjusted to the HS400 target @@ -1518,7 +1519,11 @@ static int mmc_hs200_tuning(struct mmc_card *card) if (host->ops->prepare_hs400_tuning) host->ops->prepare_hs400_tuning(host, &host->ios); - return mmc_execute_tuning(card); + err = mmc_execute_tuning(card); + if (err) + return err; + + return mmc_select_hs400(card); } /* @@ -1733,10 +1738,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, err = mmc_hs200_tuning(card); if (err) goto free_card; - - err = mmc_select_hs400(card); - if (err) - goto free_card; } else if (!mmc_card_hs400es(card)) { /* Select the desired bus width optionally */ err = mmc_select_bus_width(card);