From patchwork Fri Dec 29 17:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 122946 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4917576qgn; Fri, 29 Dec 2017 09:05:29 -0800 (PST) X-Google-Smtp-Source: ACJfBosbjN8O7JOjNO0S+LWQfHVb0ggmA8EM6WWQ5m0aoCPpPxRRPkSjY8ayAnQRdi1KHW00Iv9h X-Received: by 10.80.139.180 with SMTP id m49mr47414484edm.36.1514567129513; Fri, 29 Dec 2017 09:05:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514567129; cv=none; d=google.com; s=arc-20160816; b=enhGmr4O0+SHH6CghJD4IH99E2eXHZVM1R49Dje4EqF1u5xv48J+ebl8IIkgqe4eO1 QZF4g7XzGKujek1D+K3XXz4xKqu3ZIb9yAnqnZ5GXwNc3Hy9X8DXdvuZKzOUWdJWywK5 E8oYGkHYwhVGsALl5n+vjPOlYxpJweJP5uctX/JK2rVlhOSlRBfG4/iRt2mtDTtFfuPU v3AjQkcsp58pl7qnFLUxRBEEa4Sy3yiPxtNq1tHZrRsy2KDOmIbrirI+HmtT2rNgk/sB mfQClE6CDCuaeXvAr1+Cejin4Rmn9sW2XL5P56wggnccH/+se8M+RxzRkCBHwJp1QPDR uwNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=Qt7aCNwhM/uGvT0ShFatktoa5sxWFzkhPBs3X/H1w0Q=; b=w2z6Y8Fwc00lnrVj9KrFVsGVqSCGplySBPtNQRsYNyxK5P8jZoHUTTHiJaoiCpfNg/ NVZ47KN8fYCJzxaTrxGQoz65Nfuk12cgK/qV3h8TnMwELEx3DMXt7ythJ69OmRgZePiA uPCoMkawfYeDr4Ptcj1L6YH+8ouOPDlSH90slpIXuyU5vFBmS7hIhao3+Q70YUhjwBxU AzTdNZgbMTFZhkiwcFuZ9BmRiGD/Shvmpw9wCTZUhopc9Npf6K91lFM1K6kYhQ8cmh82 7CtjXrX3VMlMaWUWR2pgZLIkwrsbonmCToKyZ0RshzNXyFowyulD0Rhguvzl2YH8hWLF NH6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=O3uWL45A; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id a27si1331151edd.542.2017.12.29.09.05.29; Fri, 29 Dec 2017 09:05:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=O3uWL45A; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 11F82C21E08; Fri, 29 Dec 2017 17:02:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8FCF8C21DCE; Fri, 29 Dec 2017 17:00:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 920A8C21D5D; Fri, 29 Dec 2017 17:00:39 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 4B832C21DA0 for ; Fri, 29 Dec 2017 17:00:38 +0000 (UTC) Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id vBTH0O9L000541; Sat, 30 Dec 2017 02:00:26 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com vBTH0O9L000541 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1514566826; bh=ZBd90A87bHiCk263Q3i3a/GHUsTZZgSzb9+yxESXn3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O3uWL45Ajk60epq1lj96NjpS0Xh2x2Tmj/4rErZYyRBJb+YwG3GUVriBPVQrrZSAU WCv2SIpHABo14DFSTZjCJqC4F/Tw4v4g1T9tXEX0rDIpQZg8dAO4/+VLkGlfYBWqbL 4atQiEcQbbfKTR79AM6GydyyhaFPMqgMm8AedThLH0LI7w+fRzXPmepFKnabsU73fR +vjTjMFw66aDC0xpatfz6OiDpZaClXDWHvp/JZvP2jQZRLC9Gg3ExBo4KOMTSygRLE HCy0/oCnFWO0msBcPkkZN9gLSZ52fDQTZdN6fgdq0i75nkKxJTF3bRFmzehzH27Mdl k5s8QPZv9JyPw== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 30 Dec 2017 02:00:08 +0900 Message-Id: <1514566812-16781-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514566812-16781-1-git-send-email-yamada.masahiro@socionext.com> References: <1514566812-16781-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 4/8] mmc: sdhci: do not overwrite host_caps in sdhci_setup_cfg() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This line overwrites host_cap that has been set by drivers and/or helpers like mmc_of_parse(). Accumulate capabilities flags. Signed-off-by: Masahiro Yamada --- drivers/mmc/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index e2ddf5d..243e0e5 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -594,7 +594,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE) cfg->voltages |= host->voltages; - cfg->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; + cfg->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; /* Since Host Controller Version3.0 */ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {