Merge tag 'mmc-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc (88098fd6) · Commits · 戴 / test

drivers/mmc/host/sdhci-esdhc.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		* Copyright (c) 2007 Freescale Semiconductor, Inc.
		* Copyright (c) 2009 MontaVista Software, Inc.
		* Copyright (c) 2010 Pengutronix e.K.
		* Copyright 2020 NXP
		* Author: Wolfram Sang <kernel@pengutronix.de>
		*/

		@@ -88,6 +89,7 @@
		/* DLL Config 0 Register */
		#define ESDHC_DLLCFG0 0x160
		#define ESDHC_DLL_ENABLE 0x80000000
		#define ESDHC_DLL_RESET 0x40000000
		#define ESDHC_DLL_FREQ_SEL 0x08000000

		/* DLL Config 1 Register */

drivers/mmc/host/sdhci-of-esdhc.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		*
		* Copyright (c) 2007, 2010, 2012 Freescale Semiconductor, Inc.
		* Copyright (c) 2009 MontaVista Software, Inc.
		* Copyright 2020 NXP
		*
		* Authors: Xiaobo Xie <X.Xie@freescale.com>
		* Anton Vorontsov <avorontsov@ru.mvista.com>
		@@ -19,6 +20,7 @@
		#include <linux/clk.h>
		#include <linux/ktime.h>
		#include <linux/dma-mapping.h>
		#include <linux/iopoll.h>
		#include <linux/mmc/host.h>
		#include <linux/mmc/mmc.h>
		#include "sdhci-pltfm.h"
		@@ -743,6 +745,21 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
		if (host->mmc->actual_clock == MMC_HS200_MAX_DTR)
		temp \|= ESDHC_DLL_FREQ_SEL;
		sdhci_writel(host, temp, ESDHC_DLLCFG0);

		temp \|= ESDHC_DLL_RESET;
		sdhci_writel(host, temp, ESDHC_DLLCFG0);
		udelay(1);
		temp &= ~ESDHC_DLL_RESET;
		sdhci_writel(host, temp, ESDHC_DLLCFG0);

		/* Wait max 20 ms */
		if (read_poll_timeout(sdhci_readl, temp,
		temp & ESDHC_DLL_STS_SLV_LOCK,
		10, 20000, false,
		host, ESDHC_DLLSTAT0))
		pr_err("%s: timeout for delay chain lock.\n",
		mmc_hostname(host->mmc));

		temp = sdhci_readl(host, ESDHC_TBCTL);
		sdhci_writel(host, temp \| ESDHC_HS400_WNDW_ADJUST, ESDHC_TBCTL);

		@@ -1052,6 +1069,17 @@ static int esdhc_execute_tuning(struct mmc_host *mmc, u32 opcode)

		esdhc_tuning_block_enable(host, true);

		/*
		* The eSDHC controller takes the data timeout value into account
		* during tuning. If the SD card is too slow sending the response, the
		* timer will expire and a "Buffer Read Ready" interrupt without data
		* is triggered. This leads to tuning errors.
		*
		* Just set the timeout to the maximum value because the core will
		* already take care of it in sdhci_send_tuning().
		*/
		sdhci_writeb(host, 0xe, SDHCI_TIMEOUT_CONTROL);

		hs400_tuning = host->flags & SDHCI_HS400_TUNING;

		do {

drivers/mmc/host/sdhci.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1384,9 +1384,11 @@ static inline void sdhci_auto_cmd_select(struct sdhci_host *host,
		/*
		* In case of Version 4.10 or later, use of 'Auto CMD Auto
		* Select' is recommended rather than use of 'Auto CMD12
		* Enable' or 'Auto CMD23 Enable'.
		* Enable' or 'Auto CMD23 Enable'. We require Version 4 Mode
		* here because some controllers (e.g sdhci-of-dwmshc) expect it.
		*/
		if (host->version >= SDHCI_SPEC_410 && (use_cmd12 \|\| use_cmd23)) {
		if (host->version >= SDHCI_SPEC_410 && host->v4_mode &&
		(use_cmd12 \|\| use_cmd23)) {
		*mode \|= SDHCI_TRNS_AUTO_SEL;

		ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);

Admin message