From patchwork Thu Aug 25 07:04:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 74649 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp690071qga; Thu, 25 Aug 2016 00:02:48 -0700 (PDT) X-Received: by 10.194.43.9 with SMTP id s9mr6346676wjl.46.1472108568358; Thu, 25 Aug 2016 00:02:48 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id yr10si12372290wjb.251.2016.08.25.00.02.47; Thu, 25 Aug 2016 00:02:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A12044BA29; Thu, 25 Aug 2016 09:02:46 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JM3cNaixdwBp; Thu, 25 Aug 2016 09:02:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 434C64B9CB; Thu, 25 Aug 2016 09:02:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DD33B4BA35 for ; Thu, 25 Aug 2016 09:02:40 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bxdfw58F-oxh for ; Thu, 25 Aug 2016 09:02:40 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 1D21F4B9B1 for ; Thu, 25 Aug 2016 09:02:36 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id u7P72PXo002611; Thu, 25 Aug 2016 16:02:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u7P72PXo002611 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1472108548; bh=xt8zAJXUh9q7EDUNm1vucDOWyOBPXJUTH+vd0u0aUN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=prwPlvjz+zOoh5RB2/X2NVz9SK7+SNu4PqPfnurySlhQ5Ervyly5Ui19/ut+Xc44f kzdjGztjE/+emdHs34paHM4tyISgMDg/WhqxK/gt0wTGCBqdqx4gqU84TF20xAuEDR Px7OFlKUQltVR8Q9+A0j9ErApb4s+nfSnDy5JUp5SySqPEesrB2lOySM3ACKRe7fEW n2MMvrHV2RqNFopQCnIS2Gok0ummRS4qMpz09M9LSgVcVPAlXldSv++HPt0psOxxfz CzyS3ZIttHBs8QR5ZPBhicH9S/fNMrClcc+g2xY5ICZnpMt0qhAXV+CdiMloPQI36g I1z6+UjR57IcA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 25 Aug 2016 16:04:23 +0900 Message-Id: <1472108663-17156-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472108663-17156-1-git-send-email-yamada.masahiro@socionext.com> References: <1472108663-17156-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 6/6] mmc: sdhci: drop CONFIG_ from CONFIG_SDHCI_CMD_MAX_TIMEOUT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" No need for per-SoC adjustment for this parameter. It should be determined by the slowest hardware. Currently, no board overrides this CONFIG, so 3.2 sec is large enough. (If not, we can make it even larger.) Signed-off-by: Masahiro Yamada --- drivers/mmc/sdhci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index d486082..de5a491 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -124,9 +124,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, * Each function call will use last timeout value. Max timeout can be redefined * in board config file. */ -#ifndef CONFIG_SDHCI_CMD_MAX_TIMEOUT -#define CONFIG_SDHCI_CMD_MAX_TIMEOUT 3200 -#endif +#define SDHCI_CMD_MAX_TIMEOUT 3200 #define SDHCI_CMD_DEFAULT_TIMEOUT 100 #define SDHCI_READ_STATUS_TIMEOUT 1000 @@ -164,7 +162,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { if (time >= cmd_timeout) { printf("%s: MMC: %d busy ", __func__, mmc_dev); - if (2 * cmd_timeout <= CONFIG_SDHCI_CMD_MAX_TIMEOUT) { + if (2 * cmd_timeout <= SDHCI_CMD_MAX_TIMEOUT) { cmd_timeout += cmd_timeout; printf("timeout increasing to: %u ms.\n", cmd_timeout);