Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp55349imm; Thu, 30 Aug 2018 08:10:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaFz0eP1/97E439whOzLhGHe67O4tXxOFQDmhGSUinHSbqB44wWFoI1SPt9cpeHMYgKa4Ge X-Received: by 2002:a63:e647:: with SMTP id p7-v6mr9777186pgj.218.1535641850635; Thu, 30 Aug 2018 08:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535641850; cv=none; d=google.com; s=arc-20160816; b=Da0+geRkiQZ6x7zXhUGyhTb2jFsrC38l7yOwKy2DybAirgOiDy3VSjM6k5HwV3vB0K ZIIZlBrq6G6K8ImhfX9aKKnsnuDlAIv7398SDCAzQpVVSxE7R4BphlWiQpHIu5YxHEsE GHt9Zd79y8vpQt+Wrf/+FHR3OUTmljDc1ojw80Cxigg0W79b6fg336mp1qVl0RRyoHjp rbMK90qe0wN6P8ylGh01d1QjtiZuFV2DO+o2PmnKOMF+vBW0iyiTz6hiD++BMMuWtL8A W2J9m3Ls9BVWXYKl5AW5xtD+goeVv2Iw0TV9WInsmHyqB3KVlmRSknJhPPxw1DLBQfb7 +Xog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=TFUUUI9E6zuJ//PhszkUSMze5PM3Vu0cgTSUW+hEzmo=; b=NhyV6h0RialfgXuyW6C8+n9+03xoPGK9tUqe/MjisrD99JwRNF5tfjmBFUGq8tUxNO rJp5eSzXLfAbYkgcCGOTnqdBQk7FHpMzofNo8c1RR4S1nx+0zESgSOYbdbmvY1ZCmQy/ GuNPz8KN8hgCzbiI0CTklX9osO7odpFAGINMUBeQb1wqKGwfyoD9vs559pxBxaQbg12+ ECi4ndDA9FHvwM6RfizeROOsxU6XN5BQRaFLRNq88ICiU4boVSprRFjylIsSpvj7L+Qh 22tZu7Dx3hKhY2G5APGPfE16vG9ib6kuab4kFQ8DqR81dkWWA9ImWyHYEX1LcwHW/aTE Vf4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca2-v6si7434735plb.305.2018.08.30.08.10.30; Thu, 30 Aug 2018 08:10:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729650AbeH3TKJ (ORCPT + 99 others); Thu, 30 Aug 2018 15:10:09 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11546 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728787AbeH3TKI (ORCPT ); Thu, 30 Aug 2018 15:10:08 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 30 Aug 2018 08:07:29 -0700 Received: from HQMAIL103.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Thu, 30 Aug 2018 08:07:32 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Thu, 30 Aug 2018 08:07:32 -0700 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 30 Aug 2018 15:07:32 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Thu, 30 Aug 2018 15:07:32 +0000 Received: from dhcp-10-21-25-168.Nvidia.com (Not Verified[10.21.25.201]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Thu, 30 Aug 2018 08:07:32 -0700 From: Aapo Vienamo To: Rob Herring , Mark Rutland , Thierry Reding , Jonathan Hunter , Ulf Hansson , Adrian Hunter , Mikko Perttunen , Stefan Agner CC: , , , , Aapo Vienamo Subject: [PATCH v3 15/38] mmc: tegra: Disable card clock during pad calibration Date: Thu, 30 Aug 2018 18:06:16 +0300 Message-ID: <20180830150639.21048-16-avienamo@nvidia.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830150639.21048-1-avienamo@nvidia.com> References: <20180830150639.21048-1-avienamo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Disable the card clock during automatic pad drive strength calibration and re-enable it afterwards. Signed-off-by: Aapo Vienamo Acked-by: Thierry Reding --- drivers/mmc/host/sdhci-tegra.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index e63cd6b2fc9f..ec07a3ce0247 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -260,11 +260,35 @@ static void tegra_sdhci_configure_cal_pad(struct sdhci_host *host, bool enable) usleep_range(1, 2); } +static bool tegra_sdhci_configure_card_clk(struct sdhci_host *host, bool enable) +{ + bool status; + u32 reg; + + reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + status = !!(reg & SDHCI_CLOCK_CARD_EN); + + if (status == enable) + return status; + + if (enable) + reg |= SDHCI_CLOCK_CARD_EN; + else + reg &= ~SDHCI_CLOCK_CARD_EN; + + sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL); + + return status; +} + static void tegra_sdhci_pad_autocalib(struct sdhci_host *host) { + bool card_clk_enabled; u32 reg; int ret; + card_clk_enabled = tegra_sdhci_configure_card_clk(host, false); + tegra_sdhci_configure_cal_pad(host, true); reg = sdhci_readl(host, SDHCI_TEGRA_AUTO_CAL_CONFIG); @@ -279,6 +303,8 @@ static void tegra_sdhci_pad_autocalib(struct sdhci_host *host) tegra_sdhci_configure_cal_pad(host, false); + tegra_sdhci_configure_card_clk(host, card_clk_enabled); + if (ret) dev_err(mmc_dev(host->mmc), "Pad autocal timed out\n"); } -- 2.18.0