Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp284633imm; Fri, 10 Aug 2018 11:11:34 -0700 (PDT) X-Google-Smtp-Source: AA+uWPynBa8DcF/7JO0f72QbNp9YFfjcUxVFw/KDJiTo9rkNKrDPg8CnO2JWEY9dkEaNK9PG2NBa X-Received: by 2002:a63:1c5f:: with SMTP id c31-v6mr7534583pgm.321.1533924693946; Fri, 10 Aug 2018 11:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533924693; cv=none; d=google.com; s=arc-20160816; b=qSnKCcB9D3mcv7MEVvNU2yuOBVfiEgmzvfhpFjre2IkGrIgKUjSJxdR8gntt9Mu+Cd j1n/+hmSTytGu1NuprHlZn3dlKkAwQqYxMiKIAv1dL+yRCvJ2u8XdXOPiz1dLbbP6wgh 3dsv3mLynBfKp7uw1DNn35cGEBkaSUIbs+IVZX1TVDfIEf4CXq83ssleLYYcvewYzdLN +stSojUzLvlfn+XwH9l/WcNc2GsaxIpFC0lw12gYiQf01wU28DkfZ0otMvgOf9PK1G0e +e7svZabcjKHJrM34b6XIAtvGsRuyKvEPSpEq9kZg+tAob8y9MulpIdo9C51Mx6r9Fyi RJwQ== 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=oS00VH0PGhXAN3df9fXuOfe71CTuJaaufHyTotI16nw=; b=pUwr+IM+TNr0fRScavmKv8G13pidWILdKFnk6AdNdFdvt9UIDeyVE28EtSEb4rQT+C xtENLZ/lPitRcScIlFm/6Kp1gF4X3zowFlKDT0HBMI+19oOt+FDlzYibh0puIobFSRxR eEI1lJF6Gke3odCkaZB+wQwkYy2/+EkAK/BKoRphWfvDYT6FQrUwYFVBu51a923mm4lQ 36L+KzwyDYtgD0rXQMmO5x88EqlrtBar26qC0hM+cpiPLK9pn++KCPOFfPIWSvl/wLnm 90ucvSYdkAVsQtASMqeDBnaOoDMwhPfD20f+VqdtvWFiKYcmI4gr1bzLEQckZvXfstrp zzDg== 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 x37-v6si9350866pgl.544.2018.08.10.11.11.19; Fri, 10 Aug 2018 11:11:33 -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 S1730319AbeHJUk4 (ORCPT + 99 others); Fri, 10 Aug 2018 16:40:56 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:3610 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728001AbeHJUkz (ORCPT ); Fri, 10 Aug 2018 16:40:55 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Fri, 10 Aug 2018 11:09:57 -0700 Received: from HQMAIL101.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Fri, 10 Aug 2018 11:09:54 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Fri, 10 Aug 2018 11:09:54 -0700 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 10 Aug 2018 18:09:59 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1347.2 via Frontend Transport; Fri, 10 Aug 2018 18:09:59 +0000 Received: from dhcp-10-21-25-168.Nvidia.com (Not Verified[10.21.25.201]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 10 Aug 2018 11:09:59 -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 v2 23/40] mmc: tegra: Configure default trim value on reset Date: Fri, 10 Aug 2018 21:08:25 +0300 Message-ID: <1533924522-1037-24-git-send-email-avienamo@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> References: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> X-NVConfidentiality: public 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 Program the outbound sampling trim value in tegra_sdhci_reset(). Unlike the outbound tap value this does not depend on the signaling mode and needs to be only programmed once. Signed-off-by: Aapo Vienamo --- drivers/mmc/host/sdhci-tegra.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 208a269..7f1b0b4 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -37,6 +37,8 @@ #define SDHCI_TEGRA_VENDOR_CLOCK_CTRL 0x100 #define SDHCI_CLOCK_CTRL_TAP_MASK 0x00ff0000 #define SDHCI_CLOCK_CTRL_TAP_SHIFT 16 +#define SDHCI_CLOCK_CTRL_TRIM_MASK 0x1f000000 +#define SDHCI_CLOCK_CTRL_TRIM_SHIFT 24 #define SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE BIT(5) #define SDHCI_CLOCK_CTRL_PADPIPE_CLKEN_OVERRIDE BIT(3) #define SDHCI_CLOCK_CTRL_SPI_MODE_CLKEN_OVERRIDE BIT(2) @@ -287,7 +289,8 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) SDHCI_MISC_CTRL_ENABLE_DDR50 | SDHCI_MISC_CTRL_ENABLE_SDR104); - clk_ctrl &= ~SDHCI_CLOCK_CTRL_SPI_MODE_CLKEN_OVERRIDE; + clk_ctrl &= ~(SDHCI_CLOCK_CTRL_TRIM_MASK | + SDHCI_CLOCK_CTRL_SPI_MODE_CLKEN_OVERRIDE); if (tegra_sdhci_is_pad_and_regulator_valid(host)) { /* Erratum: Enable SDHCI spec v3.00 support */ @@ -304,6 +307,8 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) clk_ctrl |= SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE; } + clk_ctrl |= tegra_host->default_trim << SDHCI_CLOCK_CTRL_TRIM_SHIFT; + sdhci_writel(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL); sdhci_writel(host, clk_ctrl, SDHCI_TEGRA_VENDOR_CLOCK_CTRL); -- 2.7.4