From patchwork Thu Aug 25 07:07:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 74661 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp691992qga; Thu, 25 Aug 2016 00:07:13 -0700 (PDT) X-Received: by 10.28.146.211 with SMTP id u202mr6238126wmd.54.1472108833234; Thu, 25 Aug 2016 00:07:13 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id q134si30369197wmg.137.2016.08.25.00.07.12; Thu, 25 Aug 2016 00:07:13 -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 68D70A756F; Thu, 25 Aug 2016 09:06:44 +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 Rm1on-Cx6DYp; Thu, 25 Aug 2016 09:06:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 449A9A75EE; Thu, 25 Aug 2016 09:06:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A97DD4BA3B for ; Thu, 25 Aug 2016 09:06:05 +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 UDpz3I2jdjfm for ; Thu, 25 Aug 2016 09:06:05 +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-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by theia.denx.de (Postfix) with ESMTPS id CF2AA4BD3D for ; Thu, 25 Aug 2016 09:06:00 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id u7P75YP0012634; Thu, 25 Aug 2016 16:05:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u7P75YP0012634 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1472108736; bh=THf9UWmaYEHtE6wo157ZJ6l4Yf2GsCEgMW7oTz/dQiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iojF10DDBYeAaN8a56CmLvZna4Tq5lsPTWWCcyPHots+LIfqVMs5ji6t82tEecxVP C4GArjJRCP9tqdpeMzcIFrGVY1svH2sNyhEnHLy7Qxm/EOXgtxQIu8m1Io2fapq0Xm QlTJcC1rJtwcYlA09EIbfDw7i+yjDK7t/5LlcbGaYNeyXuJFvd958mI5AGfUeEjaaO r7VeNi57+Orq1ydb1lMyMM/I/8XHlCBg6MCRipJ7mIwLjzVmlDnq7AqeRZpXn+sqMh H8Km9bd6kmRVGD+7OaYyTTwwuc/otTYk+Vn8StwE2bQZcMowJrsSGxjWyWjRUxvYq+ 7mH6rzC+N6fhg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 25 Aug 2016 16:07:37 +0900 Message-Id: <1472108859-19262-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472108859-19262-1-git-send-email-yamada.masahiro@socionext.com> References: <1472108859-19262-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v2 4/6] mmc: sdhci: move SDMA capability check to sdhci_setup_cfg() 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. Move this quirk handling to sdhci_setup_cfg(), which is now the central place for hardware capability checks. Signed-off-by: Masahiro Yamada --- Changes in v2: None drivers/mmc/sdhci.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 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 c66151c..da73653 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -519,6 +519,14 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, u32 caps; caps = sdhci_readl(host, SDHCI_CAPABILITIES); + +#ifdef CONFIG_MMC_SDMA + if (!(caps & SDHCI_CAN_DO_SDMA)) { + printf("%s: Your controller doesn't support SDMA!!\n", + __func__); + return -EINVAL; + } +#endif host->version = sdhci_readw(host, SDHCI_HOST_VERSION); cfg->name = host->name; @@ -585,17 +593,6 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) { int ret; -#ifdef CONFIG_MMC_SDMA - unsigned int caps; - - caps = sdhci_readl(host, SDHCI_CAPABILITIES); - if (!(caps & SDHCI_CAN_DO_SDMA)) { - printf("%s: Your controller doesn't support SDMA!!\n", - __func__); - return -1; - } -#endif - ret = sdhci_setup_cfg(&host->cfg, host, max_clk, min_clk); if (ret) return ret;