From patchwork Thu Aug 25 07:04:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 74650 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp690200qga; Thu, 25 Aug 2016 00:03:03 -0700 (PDT) X-Received: by 10.28.208.140 with SMTP id h134mr6573443wmg.101.1472108582655; Thu, 25 Aug 2016 00:03:02 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ck13si12439562wjb.10.2016.08.25.00.03.02; Thu, 25 Aug 2016 00:03:02 -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 D16C6A7534; Thu, 25 Aug 2016 09:02:54 +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 6RqF2Ok48j_9; Thu, 25 Aug 2016 09:02:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 621A44BA81; Thu, 25 Aug 2016 09:02:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D7AA04BA29 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 DBctycST9AST 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 419554BA16 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 u7P72PXj002611; Thu, 25 Aug 2016 16:02:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u7P72PXj002611 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1472108546; bh=gFpjHZa/iKu8VOUm0fBENmraK3dOr20qpC7+pKWtTRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=imCye4ELaSD/k7S/9aSv+PjPbuhyWRnp9OIqB8YiwIbeCN/34yr4rDOfAMU2um4tS jqk5h7KknV+ptek4/C3mVreK+Xcg3y/mi0gjD8gTdW8UfLkZPXFy1D25P1/lma6yid sADHY6/gi0G6Z8O8MljrohL4dJ0NI4+Xppe+FZs/oNdXIIsQ09TUWH8ARqiFdejKi/ Wetw8EdgAps50Xdur1/sufwpGdCGJm4+WZujOdNaTEpEzDNITtIpFvRf13azYDB4U9 R5bDJv95Q2RN9wt7Y/PnrWgRqVl74viuQ6m8n9kWutK6qp9wDdGWxZTk7D+U1/Fqew PC0yGStLmtsIA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 25 Aug 2016 16:04:18 +0900 Message-Id: <1472108663-17156-2-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 1/6] mmc: sdhci: move sdhci_reset() call to sdhci_init() 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" If CONFIG_BLK is enabled, add_sdhci() is never called. So, sdhci_reset() is not called, either. This is a problem for my board as it needs the reset to start from a sane state. Move the add_sdhci() call to sdhci_init(), which is visited by both of the with/without CONFIG_BLK cases. Signed-off-by: Masahiro Yamada --- drivers/mmc/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7ddb549..91cc8b2 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -451,6 +451,8 @@ static int sdhci_init(struct mmc *mmc) { struct sdhci_host *host = mmc->priv; + sdhci_reset(host, SDHCI_RESET_ALL); + if ((host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) && !aligned_buffer) { aligned_buffer = memalign(8, 512*1024); if (!aligned_buffer) { @@ -595,8 +597,6 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE) host->cfg.voltages |= host->voltages; - sdhci_reset(host, SDHCI_RESET_ALL); - host->mmc = mmc_create(&host->cfg, host); if (host->mmc == NULL) { printf("%s: mmc create fail!\n", __func__);