diff mbox series

[5.4,058/104] mmc: tegra: fix SDR50 tuning override

Message ID	20200128135825.632206424@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=oJ2n=3R=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Adrian Hunter <adrian.hunter@intel.com>, Thierry Reding <treding@nvidia.com>, =?utf-8?q?Micha=C5=82_Mir?= =?utf-8?b?b3PFgmF3?= <mirq-linux@rere.qmqm.pl>, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 5.4 058/104] mmc: tegra: fix SDR50 tuning override Date: Tue, 28 Jan 2020 15:00:19 +0100 Message-Id: <20200128135825.632206424@linuxfoundation.org> In-Reply-To: <20200128135817.238524998@linuxfoundation.org> References: <20200128135817.238524998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,002/104] firestream: fix memory leaks [5.4,004/104] ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions [5.4,005/104] net: bcmgenet: Use netif_tx_napi_add() for TX NAPI [5.4,006/104] net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM [5.4,009/104] net, ip_tunnel: fix namespaces move [5.4,011/104] net_sched: fix datalen for ematch [5.4,014/104] net: usb: lan78xx: Add .ndo_features_check [5.4,016/104] tcp_bbr: improve arithmetic division in bbr_update_bw() [5.4,017/104] tcp: do not leave dangling pointers in tp->highest_sack [5.4,019/104] airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE [5.4,022/104] fou: Fix IPv6 netlink policy [5.4,024/104] net/mlx5: Fix lowest FDB pool size [5.4,026/104] net/mlx5: DR, Enable counter on non-fwd-dest objects [5.4,029/104] net/mlx5e: kTLS, Fix corner-case checks in TX resync flow [5.4,032/104] ipv4: Detect rollover in specific fib table dump [5.4,033/104] Revert "io_uring: only allow submit from owning task" [5.4,034/104] afs: Fix characters allowed into cell names [5.4,036/104] hwmon: (core) Do not use device managed functions for memory allocations [5.4,037/104] ceph: hold extra reference to r_parent over life of request [5.4,038/104] PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken [5.4,042/104] tracing: trigger: Replace unneeded RCU-list traversals [5.4,045/104] tracing: Fix histogram code when expression has same var as value [5.4,046/104] powerpc/mm/hash: Fix sharing context ids between kernel & userspace [5.4,048/104] Revert "iwlwifi: mvm: fix scan config command size" [5.4,050/104] XArray: Fix infinite loop with entry at ULONG_MAX [5.4,051/104] XArray: Fix xa_find_after with multi-index entries [5.4,053/104] pinctrl: sunrisepoint: Add missing Interrupt Status register offset [5.4,057/104] ARM: 8950/1: ftrace/recordmcount: filter relocation types [5.4,058/104] mmc: tegra: fix SDR50 tuning override [5.4,059/104] mmc: sdhci: fix minimum clock rate for v3 controller [5.4,060/104] mmc: sdhci_am654: Remove Inverted Write Protect flag [5.4,063/104] net/tls: fix async operation [5.4,066/104] Input: gtco - fix endpoint sanity check [5.4,067/104] Input: aiptek - fix endpoint sanity check [5.4,068/104] Input: pegasus_notetaker - fix endpoint sanity check [5.4,070/104] netfilter: nft_osf: add missing check for DREG attribute [5.4,072/104] iommu/amd: Fix IOMMU perf counter clobbering during init [5.4,074/104] leds: gpio: Fix uninitialized gpio label for fwnode based probe [5.4,076/104] hwmon: (nct7802) Fix voltage limits to wrong registers [5.4,081/104] iwlwifi: mvm: fix potential SKB leak on TXQ TX [5.4,084/104] net, sk_msg: Dont check if sock is locked when tearing down psock [5.4,085/104] do_last(): fetch directory ->i_mode and ->i_uid before its too late [5.4,086/104] readdir: be more conservative with directory entry names [5.4,089/104] net/sonic: Use MMIO accessors [5.4,090/104] net/sonic: Fix interface error stats collection [5.4,093/104] net/sonic: Improve receive descriptor status flag check [5.4,095/104] net/sonic: Quiesce SONIC before re-initializing descriptor memory [5.4,096/104] net/sonic: Fix command register usage [5.4,099/104] libertas: Fix two buffer overflows at parsing bss descriptor [5.4,101/104] netfilter: ipset: use bitmap infrastructure completely [5.4,102/104] netfilter: nf_tables: add __nft_chain_type_get() [5.4,104/104] net/x25: fix nonblocking connect

Commit Message

Greg KH Jan. 28, 2020, 2 p.m. UTC

From: Michał Mirosław <mirq-linux@rere.qmqm.pl>

commit f571389c0b015e76f91c697c4c1700aba860d34f upstream.

Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
broke SDR50 tuning override. Use correct NVQUIRK_ name.

Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
Cc: <stable@vger.kernel.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/9aff1d859935e59edd81e4939e40d6c55e0b55f6.1578390388.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/mmc/host/sdhci-tegra.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -386,7 +386,7 @@  static void tegra_sdhci_reset(struct sdh
 			misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50;
 		if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104)
 			misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104;
-		if (soc_data->nvquirks & SDHCI_MISC_CTRL_ENABLE_SDR50)
+		if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50)
 			clk_ctrl |= SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE;
 	}