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 8624f0a0b42d4094d7e2aef13f92ddf5ff915f1f..ac057e200e073085b86cdfe8ff2f9c61aa1fd02a 100644 (file)
--- 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 <ulf.hansson@linaro.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/mmc-esdhc-imx.h>
+ #include <linux/pm_runtime.h>
++#include <linux/iopoll.h>
+ #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 <gregkh@linuxfoundation.org>
  
        /* 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 9ff4e44e59446b5d9e79930c42171e622fc26ca2..612a87589b3c013b218b1ed9344a94667c16c3b7 100644 (file)
--- 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 <ulf.hansson@linaro.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/mmc-esdhc-imx.h>
+ #include <linux/pm_runtime.h>
++#include <linux/iopoll.h>
+ #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 <gregkh@linuxfoundation.org>
  
        /* 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 177ad8f125505bcc48bf3c7260909f6f25428346..44a843eacd84cc0c5a4a52b3a97ecd201532d27e 100644 (file)
--- 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 <ulf.hansson@linaro.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/mmc-esdhc-imx.h>
+ #include <linux/pm_runtime.h>
++#include <linux/iopoll.h>
+ #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 <gregkh@linuxfoundation.org>
  
        /* 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;