From: Greg Kroah-Hartman Date: Mon, 1 Nov 2021 11:39:54 +0000 (+0100) Subject: fix up mmc patch X-Git-Tag: v4.4.291~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37565132ad76eab81d0ba79aed19352a729a6e2f;p=thirdparty%2Fkernel%2Fstable-queue.git fix up mmc patch --- diff --git a/queue-4.14/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch b/queue-4.14/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch index 8624f0a0b42..ac057e200e0 100644 --- a/queue-4.14/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch +++ b/queue-4.14/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch @@ -30,12 +30,20 @@ Link: https://lore.kernel.org/r/1634263236-6111-1-git-send-email-haibo.chen@nxp. Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- - drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c -@@ -927,6 +927,7 @@ static void esdhc_reset_tuning(struct sd +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "sdhci-pltfm.h" + #include "sdhci-esdhc.h" + +@@ -927,6 +928,7 @@ static void esdhc_reset_tuning(struct sd struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); u32 ctrl; @@ -43,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman /* Reset the tuning circuit */ if (esdhc_is_usdhc(imx_data)) { -@@ -939,7 +940,22 @@ static void esdhc_reset_tuning(struct sd +@@ -939,7 +941,22 @@ static void esdhc_reset_tuning(struct sd } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) { ctrl = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS); ctrl &= ~ESDHC_MIX_CTRL_SMPCLK_SEL; diff --git a/queue-4.19/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch b/queue-4.19/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch index 9ff4e44e594..612a87589b3 100644 --- a/queue-4.19/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch +++ b/queue-4.19/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch @@ -30,12 +30,20 @@ Link: https://lore.kernel.org/r/1634263236-6111-1-git-send-email-haibo.chen@nxp. Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- - drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c -@@ -947,6 +947,7 @@ static void esdhc_reset_tuning(struct sd +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include "sdhci-pltfm.h" + #include "sdhci-esdhc.h" + +@@ -947,6 +948,7 @@ static void esdhc_reset_tuning(struct sd struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); u32 ctrl; @@ -43,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman /* Reset the tuning circuit */ if (esdhc_is_usdhc(imx_data)) { -@@ -959,7 +960,22 @@ static void esdhc_reset_tuning(struct sd +@@ -959,7 +961,22 @@ static void esdhc_reset_tuning(struct sd } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) { ctrl = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS); ctrl &= ~ESDHC_MIX_CTRL_SMPCLK_SEL; diff --git a/queue-5.4/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch b/queue-5.4/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch index 177ad8f1255..44a843eacd8 100644 --- a/queue-5.4/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch +++ b/queue-5.4/mmc-sdhci-esdhc-imx-clear-the-buffer_read_ready-to-reset-standard-tuning-circuit.patch @@ -30,12 +30,20 @@ Link: https://lore.kernel.org/r/1634263236-6111-1-git-send-email-haibo.chen@nxp. Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- - drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c -@@ -1022,6 +1022,7 @@ static void esdhc_reset_tuning(struct sd +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "sdhci-pltfm.h" + #include "sdhci-esdhc.h" + #include "cqhci.h" +@@ -1022,6 +1023,7 @@ static void esdhc_reset_tuning(struct sd struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); u32 ctrl; @@ -43,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman /* Reset the tuning circuit */ if (esdhc_is_usdhc(imx_data)) { -@@ -1034,7 +1035,22 @@ static void esdhc_reset_tuning(struct sd +@@ -1034,7 +1036,22 @@ static void esdhc_reset_tuning(struct sd } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) { ctrl = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS); ctrl &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;