Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2b3777 authored by yinbo.zhu's avatar yinbo.zhu Committed by Greg Kroah-Hartman
Browse files

mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardb 



commit f2bc600008bd6f7f5d0b6b56238d14f95cd454d2 upstream.

When system wakes up from sleep on ls1046ardb, the SD operation fails
with mmc error messages since ESDHC_TB_EN bit couldn't be cleaned by
eSDHC_SYSCTL[RSTA]. It's proper to clean this bit in esdhc_reset()
rather than in probe.

Signed-off-by: default avataryinbo.zhu <yinbo.zhu@nxp.com>
Acked-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44e47693

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

+8 −4
Original line number Diff line number Diff line
@@ -589,10 +589,18 @@ static void esdhc_pltfm_set_bus_width(struct sdhci_host *host, int width) 


static void esdhc_reset(struct sdhci_host *host, u8 mask)

{

	u32 val;



	sdhci_reset(host, mask);



	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);

	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);



	if (mask & SDHCI_RESET_ALL) {

		val = sdhci_readl(host, ESDHC_TBCTL);

		val &= ~ESDHC_TB_EN;

		sdhci_writel(host, val, ESDHC_TBCTL);

	}

}



/* The SCFG, Supplemental Configuration Unit, provides SoC specific
@@ -785,10 +793,6 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host) 
	pltfm_host = sdhci_priv(host);

	esdhc = sdhci_pltfm_priv(pltfm_host);



	val = sdhci_readl(host, ESDHC_TBCTL);

	val &= ~ESDHC_TB_EN;

	sdhci_writel(host, val, ESDHC_TBCTL);



	host_ver = sdhci_readw(host, SDHCI_HOST_VERSION);

	esdhc->vendor_ver = (host_ver & SDHCI_VENDOR_VER_MASK) >>

			     SDHCI_VENDOR_VER_SHIFT;