+++ /dev/null
-From 97618aca1440b5addc5c3d78659d3e176be23b80 Mon Sep 17 00:00:00 2001
-From: "yinbo.zhu" <yinbo.zhu@nxp.com>
-Date: Wed, 8 Nov 2017 17:09:50 +0800
-Subject: mmc: sdhci-of-esdhc: fix eMMC couldn't work after kexec
-
-From: yinbo.zhu <yinbo.zhu@nxp.com>
-
-commit 97618aca1440b5addc5c3d78659d3e176be23b80 upstream.
-
-The bit eSDHC_TBCTL[TB_EN] couldn't be reset by eSDHC_SYSCTL[RSTA] which is
-used to reset for all. The driver should make sure it's cleared before card
-initialization, otherwise the initialization would fail.
-
-Signed-off-by: yinbo.zhu <yinbo.zhu@nxp.com>
-Acked-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mmc/host/sdhci-of-esdhc.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/mmc/host/sdhci-of-esdhc.c
-+++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -584,6 +584,10 @@ static void esdhc_init(struct platform_d
- 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;
+++ /dev/null
-From f2bc600008bd6f7f5d0b6b56238d14f95cd454d2 Mon Sep 17 00:00:00 2001
-From: "yinbo.zhu" <yinbo.zhu@nxp.com>
-Date: Fri, 1 Dec 2017 15:09:34 +0800
-Subject: mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardb
-
-From: yinbo.zhu <yinbo.zhu@nxp.com>
-
-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: yinbo.zhu <yinbo.zhu@nxp.com>
-Acked-by: Yangbo Lu <yangbo.lu@nxp.com>
-Acked-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mmc/host/sdhci-of-esdhc.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
---- a/drivers/mmc/host/sdhci-of-esdhc.c
-+++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -489,10 +489,18 @@ static void esdhc_pltfm_set_bus_width(st
-
- 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);
-+ }
- }
-
- #ifdef CONFIG_PM_SLEEP
-@@ -584,10 +592,6 @@ static void esdhc_init(struct platform_d
- 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;
arm-dts-mt2701-add-reset-cells.patch
arm-dts-delete-bogus-reference-to-the-charlcd.patch
media-r820t-fix-r820t_write_reg-for-kasan.patch
-mmc-sdhci-of-esdhc-fix-emmc-couldn-t-work-after-kexec.patch
-mmc-sdhci-of-esdhc-fix-the-mmc-error-after-sleep-on-ls1046ardb.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
